diff --git a/themes/grav/js/admin-all.js b/themes/grav/js/admin-all.js
index dd05e546..d06ce2e3 100644
--- a/themes/grav/js/admin-all.js
+++ b/themes/grav/js/admin-all.js
@@ -518,9 +518,10 @@ $(function () {
         remodal.find('.button.continue').attr('href', $(e.target).attr('href'));
     });
 
-    // Keep-alive
-    setInterval(function() {
-        keepAlive();
-    }, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts
-
+    // Setup keep-alive on pages that have at least one element with data-grav-keepalive="true" set
+    if ($(document).find('[data-grav-keepalive="true"]').length > 0) {
+        setInterval(function() {
+            keepAlive();
+        }, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts
+    }
 });
diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig
index 30cecfff..37e26611 100644
--- a/themes/grav/templates/partials/blueprints-new.html.twig
+++ b/themes/grav/templates/partials/blueprints-new.html.twig
@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}
diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig
index fd37acf6..88892915 100644
--- a/themes/grav/templates/partials/blueprints-raw.html.twig
+++ b/themes/grav/templates/partials/blueprints-raw.html.twig
@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}
diff --git a/themes/grav/templates/partials/blueprints.html.twig b/themes/grav/templates/partials/blueprints.html.twig
index 16e7e9e3..0c96fa53 100644
--- a/themes/grav/templates/partials/blueprints.html.twig
+++ b/themes/grav/templates/partials/blueprints.html.twig
@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}