diff --git a/komga-webui/src/components/ThumbnailExplorerDialog.vue b/komga-webui/src/components/ThumbnailExplorerDialog.vue
index c883256e6..5a2ec6d54 100644
--- a/komga-webui/src/components/ThumbnailExplorerDialog.vue
+++ b/komga-webui/src/components/ThumbnailExplorerDialog.vue
@@ -1,7 +1,9 @@
 <template>
-  <v-dialog v-model="input" scrollable>
+  <v-dialog v-model="input" scrollable
+            @keydown.esc.stop=""
+  >
     <v-card :max-height="$vuetify.breakpoint.height * .9" dark>
-<v-card-title>
+      <v-card-title>
         <v-pagination
           v-model="page"
           :total-visible="perPage"
diff --git a/komga-webui/src/views/BookReader.vue b/komga-webui/src/views/BookReader.vue
index 2af1b5ac7..e32687206 100644
--- a/komga-webui/src/views/BookReader.vue
+++ b/komga-webui/src/views/BookReader.vue
@@ -163,6 +163,7 @@
       :close-on-content-click="false"
       transition="dialog-bottom-transition"
       :width="$vuetify.breakpoint.width * ($vuetify.breakpoint.smAndUp ? 0.5 : 1)"
+      @keydown.esc.stop=""
     >
       <v-container fluid class="pa-0">
         <v-toolbar dark color="primary">
@@ -477,6 +478,14 @@ export default Vue.extend({
           this.showThumbnailsExplorer = !this.showThumbnailsExplorer
           break
         case 'Escape':
+          if (this.showThumbnailsExplorer) {
+            this.showThumbnailsExplorer = false
+            break
+          }
+          if (this.menu) {
+            this.menu = false
+            break
+          }
           this.closeBook()
           break
       }