diff --git a/assets/App.vue b/assets/App.vue
index 5f341aa4..bb9ba630 100644
--- a/assets/App.vue
+++ b/assets/App.vue
@@ -4,7 +4,7 @@
 
     <splitpanes @resized="onResized($event)">
       <pane min-size="10" :size="settings.menuWidth" v-if="!isMobile && !collapseNav">
-        <side-menu></side-menu>
+        <side-menu @search="showFuzzySearch"></side-menu>
       </pane>
       <pane min-size="10">
         <splitpanes>
@@ -42,11 +42,15 @@
 import { mapActions, mapGetters, mapState } from "vuex";
 import { Splitpanes, Pane } from "splitpanes";
 
+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";
 
 export default {
   name: "App",
@@ -56,6 +60,7 @@ export default {
     LogContainer,
     MobileMenu,
     Splitpanes,
+    PastTime,
     Pane,
     Search,
   },
@@ -79,6 +84,9 @@ export default {
       document.documentElement.setAttribute("data-theme", "light");
     }
     this.menuWidth = this.settings.menuWidth;
+    hotkeys("command+k, ctrl+k", (event, handler) => {
+      this.showFuzzySearch();
+    });
   },
   watch: {
     hasSmallerScrollbars(newValue, oldValue) {
@@ -100,7 +108,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(["isMobile", "settings"]),
+    ...mapState(["isMobile", "settings", "containers"]),
     ...mapGetters(["visibleContainers", "activeContainers"]),
     hasSmallerScrollbars() {
       return this.settings.smallerScrollbars;
@@ -120,6 +128,14 @@ export default {
         this.updateSetting({ menuWidth });
       }
     },
+    showFuzzySearch() {
+      this.$buefy.modal.open({
+        parent: this,
+        component: FuzzySearchModal,
+        animation: "false",
+        width: 600,
+      });
+    },
   },
 };
 </script>
diff --git a/assets/components/FuzzySearchModal.vue b/assets/components/FuzzySearchModal.vue
new file mode 100644
index 00000000..4f40126a
--- /dev/null
+++ b/assets/components/FuzzySearchModal.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="panel">
+    <b-autocomplete
+      ref="autocomplete"
+      v-model="query"
+      placeholder="Search containers using ⌘ + k, ⌃k"
+      field="name"
+      open-on-focus
+      keep-first
+      expanded
+      :data="results"
+      @select="selected"
+    >
+    </b-autocomplete>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import fuzzysort from "fuzzysort";
+
+import PastTime from "./PastTime";
+import Icon from "./Icon";
+
+export default {
+  props: {
+    maxResults: {
+      default: 20,
+      type: Number,
+    },
+  },
+  data() {
+    return {
+      query: "",
+    };
+  },
+  name: "FuzzySearchModal",
+  components: {
+    Icon,
+    PastTime,
+  },
+  mounted() {
+    this.$nextTick(() => this.$refs.autocomplete.focus());
+  },
+  watch: {},
+  methods: {
+    selected(item) {
+      this.$router.push({ name: "container", params: { id: item.id, name: item.name } });
+      this.$emit("close");
+    },
+  },
+  computed: {
+    ...mapState(["containers"]),
+    preparedContainers() {
+      return this.containers.map((c) => ({
+        name: c.name,
+        id: c.id,
+        created: c.created,
+        preparedName: fuzzysort.prepare(c.name),
+      }));
+    },
+    results() {
+      const options = {
+        limit: this.maxResults,
+        key: "preparedName",
+      };
+      if (this.query) return fuzzysort.go(this.query, this.preparedContainers, options).map((i) => i.obj);
+      else {
+        return [...this.containers].sort((a, b) => b.created - a.created);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.panel {
+  height: 400px;
+}
+</style>
diff --git a/assets/components/SideMenu.vue b/assets/components/SideMenu.vue
index 98ca0a37..c8cb6f62 100644
--- a/assets/components/SideMenu.vue
+++ b/assets/components/SideMenu.vue
@@ -8,7 +8,18 @@
           </svg>
         </router-link>
       </div>
-      <div class="column is-narrow has-text-right x">
+      <div class="column is-narrow has-text-right px-1">
+        <button
+          class="button is-small is-rounded is-settings-control"
+          @click="$emit('search')"
+          title="Search containers (⌘ + k, ⌃k)"
+        >
+          <span class="icon">
+            <icon name="search"></icon>
+          </span>
+        </button>
+      </div>
+      <div class="column is-narrow has-text-right px-0">
         <router-link
           :to="{ name: 'settings' }"
           active-class="is-active"
diff --git a/assets/main.js b/assets/main.js
index 622cd7e5..719fbcc1 100644
--- a/assets/main.js
+++ b/assets/main.js
@@ -4,6 +4,9 @@ import Meta from "vue-meta";
 import Switch from "buefy/dist/esm/switch";
 import Radio from "buefy/dist/esm/radio";
 import Field from "buefy/dist/esm/field";
+import Modal from "buefy/dist/esm/modal";
+import Autocomplete from "buefy/dist/esm/autocomplete";
+
 import store from "./store";
 import config from "./store/config";
 import App from "./App.vue";
@@ -14,6 +17,8 @@ Vue.use(Meta);
 Vue.use(Switch);
 Vue.use(Radio);
 Vue.use(Field);
+Vue.use(Modal);
+Vue.use(Autocomplete);
 
 const routes = [
   {
diff --git a/assets/pages/Container.vue b/assets/pages/Container.vue
index 9dfc4f4b..aef4445a 100644
--- a/assets/pages/Container.vue
+++ b/assets/pages/Container.vue
@@ -6,7 +6,6 @@
 import { mapActions, mapGetters, mapState } from "vuex";
 
 import LogContainer from "../components/LogContainer";
-import store from "../store";
 
 export default {
   props: ["id"],
diff --git a/assets/pages/Index.vue b/assets/pages/Index.vue
index 45a684fc..f5f330d2 100644
--- a/assets/pages/Index.vue
+++ b/assets/pages/Index.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapState } from "vuex";
+import { mapState } from "vuex";
 import Icon from "../components/Icon";
 import PastTime from "../components/PastTime";
 import config from "../store/config";
diff --git a/assets/styles.scss b/assets/styles.scss
index f107a319..e236c171 100644
--- a/assets/styles.scss
+++ b/assets/styles.scss
@@ -30,6 +30,8 @@ $link-active: $grey-dark;
 @import "~buefy/src/scss/utils/_all";
 @import "~buefy/src/scss/components/_switch";
 @import "~buefy/src/scss/components/_radio";
+@import "~buefy/src/scss/components/_modal";
+@import "~buefy/src/scss/components/_autocomplete";
 
 html {
   --scheme-main: #{$black};
@@ -141,7 +143,6 @@ html.has-custom-scrollbars {
   }
 }
 
-
 .splitpanes__splitter {
   z-index: 99;
 }
diff --git a/integration/__tests__/__image_snapshots__/custom-base-js-dozzle-with-custom-base-renders-full-page-on-desktop-1-snap.png b/integration/__tests__/__image_snapshots__/custom-base-js-dozzle-with-custom-base-renders-full-page-on-desktop-1-snap.png
index 4f360471..8e2e8f1b 100644
Binary files a/integration/__tests__/__image_snapshots__/custom-base-js-dozzle-with-custom-base-renders-full-page-on-desktop-1-snap.png and b/integration/__tests__/__image_snapshots__/custom-base-js-dozzle-with-custom-base-renders-full-page-on-desktop-1-snap.png differ
diff --git a/integration/__tests__/__image_snapshots__/default-js-home-page-renders-full-page-on-desktop-1-snap.png b/integration/__tests__/__image_snapshots__/default-js-home-page-renders-full-page-on-desktop-1-snap.png
index f2bbc7a1..51154658 100644
Binary files a/integration/__tests__/__image_snapshots__/default-js-home-page-renders-full-page-on-desktop-1-snap.png and b/integration/__tests__/__image_snapshots__/default-js-home-page-renders-full-page-on-desktop-1-snap.png differ
diff --git a/integration/__tests__/__image_snapshots__/default-js-home-page-renders-ipad-viewport-1-snap.png b/integration/__tests__/__image_snapshots__/default-js-home-page-renders-ipad-viewport-1-snap.png
index 394deef3..7179cce3 100644
Binary files a/integration/__tests__/__image_snapshots__/default-js-home-page-renders-ipad-viewport-1-snap.png and b/integration/__tests__/__image_snapshots__/default-js-home-page-renders-ipad-viewport-1-snap.png differ
diff --git a/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-full-page-on-desktop-1-snap.png b/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-full-page-on-desktop-1-snap.png
index 1c8ae274..bd444dd2 100644
Binary files a/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-full-page-on-desktop-1-snap.png and b/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-full-page-on-desktop-1-snap.png differ
diff --git a/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-ipad-viewport-1-snap.png b/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-ipad-viewport-1-snap.png
index 409d5e14..5a68b849 100644
Binary files a/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-ipad-viewport-1-snap.png and b/integration/__tests__/__image_snapshots__/light-mode-js-dozzle-with-light-mode-renders-ipad-viewport-1-snap.png differ