diff --git a/frontend/src/Metamaps/Map/index.js b/frontend/src/Metamaps/Map/index.js
index 595ec206..1c7a6c26 100644
--- a/frontend/src/Metamaps/Map/index.js
+++ b/frontend/src/Metamaps/Map/index.js
@@ -135,8 +135,8 @@ const Map = {
   },
   end: function() {
     if (Active.Map) {
+      $('.main').removeClass('compressed')
       AutoLayout.resetSpiral()
-
       $('.rightclickmenu').remove()
       TopicCard.hideCard()
       SynapseCard.hideCard()
diff --git a/frontend/src/components/MapView/index.js b/frontend/src/components/MapView/index.js
index 342da793..21932bfd 100644
--- a/frontend/src/components/MapView/index.js
+++ b/frontend/src/components/MapView/index.js
@@ -47,6 +47,10 @@ export default class MapView extends Component {
     }
   }
 
+  componentWillUnmount() {
+    this.endMap()
+  }
+
   endMap() {
     this.setState({
       chatOpen: false
diff --git a/frontend/src/components/TopicView/index.js b/frontend/src/components/TopicView/index.js
index 07450769..edd7b92e 100644
--- a/frontend/src/components/TopicView/index.js
+++ b/frontend/src/components/TopicView/index.js
@@ -30,6 +30,10 @@ export default class TopicView extends Component {
     onZoomOut: PropTypes.func
   }
 
+  componentWillUnmount() {
+    this.endTopic()
+  }
+
   endTopic() {
     this.upperOptions.reset()
     this.props.endActiveTopic()
diff --git a/frontend/src/components/common/FilterBox.js b/frontend/src/components/common/FilterBox.js
index fbab1111..2995018a 100644
--- a/frontend/src/components/common/FilterBox.js
+++ b/frontend/src/components/common/FilterBox.js
@@ -41,7 +41,7 @@ class FilterBox extends Component {
                               + (allForFiltering.synapses.length === visibleForFiltering.synapses.length ? ' active' : '')
     const synapseNoneClass = "hideAll hideAllSynapses"
                               + (visibleForFiltering.synapses.length === 0 ? ' active' : '')
-    return <div className="sidebarFilterBox upperRightBox" style={style}>
+    return map || topic ? <div className="sidebarFilterBox upperRightBox" style={style}>
       <div className="filterBox">
         <h2>FILTER BY</h2>
         <div id="filter_by_mapper" className="filterBySection">
@@ -90,7 +90,7 @@ class FilterBox extends Component {
           <div className="clearfloat"></div>
         </div>
       </div>
-    </div>
+    </div> : null
   }
 }