diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index e937df75..c9243a70 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -139,6 +139,11 @@ editor = {
             $('#navbar-collapse').find('.nav').html(nav.html());
         }
 
+        var graph_editing = content.find('[data-graph-editing]');
+        if (graph_editing.length) {
+            editor._graph_editing = graph_editing.attr('data-graph-editing');
+        }
+
         content.find('[data-toggle="tooltip"]').tooltip();
 
         var modal_close = content.find('[data-modal-close]');
@@ -487,12 +492,6 @@ editor = {
         // called on sidebar load. start editing or creating depending on how the sidebar may require it
         var sidebarcontent = $('#sidebar').find('.content');
 
-        var graph_editing = sidebarcontent.find('[data-graph-editing]');
-        if (graph_editing.length) {
-            editor._graph_editing = graph_editing.attr('data-graph-editing');
-            return;
-        }
-
         var geometry_field = sidebarcontent.find('input[name=geometry]');
         if (geometry_field.length) {
             var form = geometry_field.closest('form');