diff --git a/notebook/templates/edit.html b/notebook/templates/edit.html
index d0ac31748..9b66df29e 100644
--- a/notebook/templates/edit.html
+++ b/notebook/templates/edit.html
@@ -19,13 +19,13 @@ data-file-path="{{file_path}}"
 {% endblock %}
 
 {% block headercontainer %}
-{{super()}}
 
 <span id="save_widget" class="pull-left save_widget">
     <span class="filename"></span>
     <span class="last_modified"></span>
 </span>
 
+{{super()}}
 {% endblock %}
 
 {% block header %}
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index bf1559289..828851f3b 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -36,7 +36,6 @@ data-notebook-path="{{notebook_path | urlencode}}"
 
 
 {% block headercontainer %}
-{{super()}}
 
 
 <span id="save_widget" class="save_widget">
@@ -45,6 +44,8 @@ data-notebook-path="{{notebook_path | urlencode}}"
     <span class="autosave_status"></span>
 </span>
 
+{{super()}}
+
 <span id="kernel_logo_widget">
   {% block kernel_logo_widget %}
   <img class="current_kernel_logo" alt="Current Kernel Logo" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"/>
diff --git a/notebook/templates/terminal.html b/notebook/templates/terminal.html
index acbbec79f..b61c13b22 100644
--- a/notebook/templates/terminal.html
+++ b/notebook/templates/terminal.html
@@ -19,8 +19,8 @@ data-ws-path="{{ws_path}}"
 {% endblock %}
 
 {% block headercontainer %}
-{{super()}}
 <span id="save_widget" class="save_widget"></span>
+{{super()}}
 {% endblock headercontainer %}
 
 {% block site %}
diff --git a/notebook/templates/tree.html b/notebook/templates/tree.html
index 6778b2ef9..d84a973c1 100644
--- a/notebook/templates/tree.html
+++ b/notebook/templates/tree.html
@@ -12,8 +12,8 @@ data-server-root="{{server_root}}"
 {% endblock %}
 
 {% block headercontainer %}
-{{super()}}
   <span class="flex-spacer"></span>
+  {{super()}}
   {% if shutdown_button %}
     <span id="shutdown_widget">
       <button id="shutdown" class="btn btn-sm navbar-btn"