diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87e894987..e5c99d696 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Restore staging server toggle [issue 514](https://github.com/nextstrain/auspice/issues/514)
+
 ## version 1.14.3 - 2018/03/01
 
 * Bug fix where tip colours reverted to their initial colours after a layout change. [issue 519](https://github.com/nextstrain/auspice/issues/519)
diff --git a/src/components/app.js b/src/components/app.js
index 59de734f8..da2f23fff 100644
--- a/src/components/app.js
+++ b/src/components/app.js
@@ -10,7 +10,7 @@ import { Entropy } from "./entropy";
 import Map from "./map/map";
 import Info from "./info/info";
 import Tree from "./tree";
-import { controlsHiddenWidth, controlsWidth, controlsPadding } from "../util/globals";
+import { controlsHiddenWidth, controlsWidth, controlsPadding, titleBarHeight } from "../util/globals";
 import { sidebarColor } from "../globalStyles";
 import TitleBar from "./framework/title-bar";
 import Footer from "./framework/footer";
@@ -72,10 +72,11 @@ const Contents = ({showSpinner, styles, availableWidth, availableHeight, panels,
 
 const Sidebar = ({show, narrative, styles}) => {
   if (!show) return null;
+  const innerH = styles.height - titleBarHeight;
   return (
     <div style={styles}>
       <TitleBar minified/>
-      {narrative ? <Narrative height={styles.height}/> : <Controls/>}
+      {narrative ? <Narrative height={innerH}/> : <Controls/>}
     </div>
   );
 };
diff --git a/src/components/controls/controls.js b/src/components/controls/controls.js
index 3beefc2d7..de3f6ee4b 100644
--- a/src/components/controls/controls.js
+++ b/src/components/controls/controls.js
@@ -12,6 +12,7 @@ import MapAnimationControls from "./map-animation";
 import DataSource from "./data-source";
 import PanelToggles from "./panel-toggles";
 import SearchStrains from "./search";
+import { titleBarHeight } from "../../util/globals";
 
 const Controls = () => (
   <div
@@ -68,6 +69,7 @@ const Controls = () => (
     <Header text="Data Source" extraStyles={{paddingTop: "10px"}}/>
     <DataSource/>
 
+    <div style={{minHeight: `${titleBarHeight + 20}px`}}/>
   </div>
 );
 
diff --git a/src/components/framework/title-bar.js b/src/components/framework/title-bar.js
index 88362f452..9e5f4430b 100644
--- a/src/components/framework/title-bar.js
+++ b/src/components/framework/title-bar.js
@@ -3,7 +3,7 @@ import React from "react";
 import { connect } from "react-redux";
 import Flex from "./flex";
 import { titleBarHeight, titleColors } from "../../util/globals";
-import { darkGrey, brandColor, materialButton, materialButtonSelected } from "../../globalStyles";
+import { darkGrey, brandColor, materialButton } from "../../globalStyles";
 import { changePage } from "../../actions/navigation";
 import { TOGGLE_NARRATIVE } from "../../actions/types";