diff --git a/share/layout/body.tt b/share/layout/body.tt
index 235394517a..c425887629 100644
--- a/share/layout/body.tt
+++ b/share/layout/body.tt
@@ -297,16 +297,6 @@ var mainWrapperInit = function () {
 $( document ).ready(function() {
     Theme.init();
     mainWrapperInit();
-    [%# open last accordion tab if possible -%]
-    $('.accordion').on('shown', function (e) {
-        localStorage.setItem('lastTab', $(".accordion .in").attr('id'));
-    });
-    var lastTab = localStorage.getItem('lastTab');
-    if (lastTab) {
-        $('#'+lastTab).removeClass('collapse');
-        $('#'+lastTab).parent().addClass("open");
-        $('#'+lastTab).addClass("in");
-    }
 });
 
 </script>
diff --git a/share/static/js/Theme.js b/share/static/js/Theme.js
index 0c1bcd78ae..2d155c27ac 100644
--- a/share/static/js/Theme.js
+++ b/share/static/js/Theme.js
@@ -40,9 +40,17 @@ var Theme = function () {
             }
         });
 
-        $('.accordion').each (function () {
-            $(this).find ('.accordion-body.in').parent ().addClass ('open');
+        $('.accordion').on('shown', function (e) {
+            localStorage.setItem('lastTab', $(".accordion .in").attr('id'));
         });
+
+        var lastTab = localStorage.getItem('lastTab');
+        if (lastTab) {
+            $('#'+lastTab).removeClass('collapse');
+            $('#'+lastTab).parent().addClass("open");
+            $('#'+lastTab).addClass("in");
+        }
+
     }
 
     function getValidationRules () {
@@ -66,4 +74,4 @@ var Theme = function () {
         return custom;
     }
 
-}();
\ No newline at end of file
+}();