diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index 64ce14dc..4d217d2d 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -223,6 +223,7 @@ editor = {
         }
         var action = $(this).attr('action');
         editor._sidebar_unload();
+        data += '&can_close_modal=' + ((editor._last_non_modal_path === null) ? '0' : '1');
         $.post(action, data, editor._sidebar_loaded).fail(editor._sidebar_error);
     },
 
diff --git a/src/c3nav/editor/templates/editor/graph_editing_settings.html b/src/c3nav/editor/templates/editor/graph_editing_settings.html
index 706693ee..ede66e35 100644
--- a/src/c3nav/editor/templates/editor/graph_editing_settings.html
+++ b/src/c3nav/editor/templates/editor/graph_editing_settings.html
@@ -4,6 +4,10 @@
 {% include 'editor/fragment_modal_close.html' %}
 <h3 {% if closemodal %}data-close-modal-now{% endif %}>{% trans 'Graph Editing Settings' %}</h3>
 
+{% if not closemodal %}
+    {% bootstrap_messages %}
+{% endif %}
+
 <form action="{{ request.path }}" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/src/c3nav/editor/views/edit.py b/src/c3nav/editor/views/edit.py
index cab4f67c..65057b68 100644
--- a/src/c3nav/editor/views/edit.py
+++ b/src/c3nav/editor/views/edit.py
@@ -386,7 +386,8 @@ def graph_editing_settings(request):
         form = GraphEditorSettingsForm(data=request.POST)
         if form.is_valid():
             messages.success(request, _('Graph Editing Settings were successfully saved.'))
-        ctx['closemodal'] = True
+        if request.POST.get('can_close_modal') == '1':
+            ctx['closemodal'] = True
     else:
         form = GraphEditorSettingsForm()