diff --git a/assets/App.vue b/assets/App.vue
index bb9ba630..448d6e8b 100644
--- a/assets/App.vue
+++ b/assets/App.vue
@@ -9,7 +9,6 @@
       <pane min-size="10">
         <splitpanes>
           <pane class="has-min-height router-view">
-            <search></search>
             <router-view></router-view>
           </pane>
           <pane v-for="other in activeContainers" :key="other.id" v-if="!isMobile">
@@ -47,7 +46,7 @@ import hotkeys from "hotkeys-js";
 import LogContainer from "./components/LogContainer";
 import SideMenu from "./components/SideMenu";
 import MobileMenu from "./components/MobileMenu";
-import Search from "./components/Search";
+
 import PastTime from "./components/PastTime";
 import Icon from "./components/Icon";
 import FuzzySearchModal from "./components/FuzzySearchModal";
@@ -62,7 +61,6 @@ export default {
     Splitpanes,
     PastTime,
     Pane,
-    Search,
   },
   data() {
     return {
diff --git a/assets/components/Search.vue b/assets/components/Search.vue
index 1a189769..d4df63f4 100644
--- a/assets/components/Search.vue
+++ b/assets/components/Search.vue
@@ -47,6 +47,10 @@ export default {
       this.resetSearch();
     });
   },
+  beforeDestroy() {
+    this.updateSearchFilter("");
+    hotkeys.unbind("command+f, ctrl+f, esc");
+  },
   methods: {
     ...mapActions({
       updateSearchFilter: "SET_SEARCH",
diff --git a/assets/pages/Container.vue b/assets/pages/Container.vue
index aef4445a..206df5c8 100644
--- a/assets/pages/Container.vue
+++ b/assets/pages/Container.vue
@@ -1,10 +1,13 @@
 <template>
-  <log-container :id="id" show-title :scrollable="activeContainers.length > 0"> </log-container>
+  <div>
+    <search></search>
+    <log-container :id="id" show-title :scrollable="activeContainers.length > 0"> </log-container>
+  </div>
 </template>
 
 <script>
 import { mapActions, mapGetters, mapState } from "vuex";
-
+import Search from "../components/Search";
 import LogContainer from "../components/LogContainer";
 
 export default {
@@ -12,6 +15,7 @@ export default {
   name: "Container",
   components: {
     LogContainer,
+    Search,
   },
   data() {
     return {