diff --git a/js/main-updated.js b/js/main-updated.js
index 7575dff..070cbed 100644
--- a/js/main-updated.js
+++ b/js/main-updated.js
@@ -127,6 +127,32 @@ const MarkitectMain = {
     setupEventHandlers: function() {
         console.log('🔌 Setting up event handlers...');
 
+        // Setup section manager event handlers
+        if (this.sectionManager) {
+            // The DOM refresh must not depend on the optional debug panel.
+            this.sectionManager.on('changes-accepted', (data) => {
+                if (this.debugPanel) {
+                    this.debugPanel.addMessage(`Changes accepted for section: ${data.sectionId}`, 'SUCCESS');
+                }
+                this.updateSectionDOM(data.sectionId);
+            });
+        }
+
+        if (this.sectionManager && this.debugPanel) {
+            this.sectionManager.on('sections-created', (data) => {
+                this.debugPanel.addMessage(`Created ${data.count} sections`, 'INFO');
+            });
+
+            this.sectionManager.on('edit-started', (data) => {
+                this.debugPanel.addMessage(`Edit started for section: ${data.sectionId}`, 'DEBUG');
+            });
+
+            this.sectionManager.on('changes-cancelled', (data) => {
+                this.debugPanel.addMessage(`Changes cancelled for section: ${data.sectionId}`, 'WARNING');
+            });
+        }
+
+        // Document-controls handlers need the (optional) document controls
         if (!this.documentControls) return;
 
         this.documentControls.setEventHandlers({
@@ -187,31 +213,6 @@ const MarkitectMain = {
                 }
             }
         });
-
-        // Setup section manager event handlers
-        if (this.sectionManager) {
-            // The DOM refresh must not depend on the optional debug panel.
-            this.sectionManager.on('changes-accepted', (data) => {
-                if (this.debugPanel) {
-                    this.debugPanel.addMessage(`Changes accepted for section: ${data.sectionId}`, 'SUCCESS');
-                }
-                this.updateSectionDOM(data.sectionId);
-            });
-        }
-
-        if (this.sectionManager && this.debugPanel) {
-            this.sectionManager.on('sections-created', (data) => {
-                this.debugPanel.addMessage(`Created ${data.count} sections`, 'INFO');
-            });
-
-            this.sectionManager.on('edit-started', (data) => {
-                this.debugPanel.addMessage(`Edit started for section: ${data.sectionId}`, 'DEBUG');
-            });
-
-            this.sectionManager.on('changes-cancelled', (data) => {
-                this.debugPanel.addMessage(`Changes cancelled for section: ${data.sectionId}`, 'WARNING');
-            });
-        }
     },
 
     // Render content using the configuration