diff --git a/script.js b/script.js
index a6cbe36d..84c7b2a4 100644
--- a/script.js
+++ b/script.js
@@ -1,15 +1,22 @@
-jQuery(function () {
+jQuery(function() {
     /* DOKUWIKI:include script/functions.js */
-
     /* DOKUWIKI:include script/EntryEditor.js */
-    EntryEditor(jQuery('#dw__editform, form.bureaucracy__plugin'));
-
     /* DOKUWIKI:include script/SchemaEditor.js */
-    SchemaEditor();
-
     /* DOKUWIKI:include script/LookupEditor.js */
-    jQuery('div.structlookup table').each(LookupEditor);
-
     /* DOKUWIKI:include script/InlineEditor.js */
-    InlineEditor(jQuery('div.structaggregation table'));
+
+    function init() {
+        EntryEditor(jQuery('#dw__editform, form.bureaucracy__plugin'));
+        SchemaEditor();
+        jQuery('div.structlookup table').each(LookupEditor);
+        InlineEditor(jQuery('div.structaggregation table'));
+    }
+
+    jQuery(init);
+
+    jQuery(window).on('fastwiki:afterSwitch', function(evt, viewMode, isSectionEdit, prevViewMode) {
+        if (viewMode=="edit" || isSectionEdit) {
+            EntryEditor(jQuery('#dw__editform, form.bureaucracy__plugin'));
+        }
+    });
 });