diff --git a/client/src/components/LibraryFolder/SearchField.vue b/client/src/components/LibraryFolder/SearchField.vue
index b4daf6f71f6..4b723ba8e62 100644
--- a/client/src/components/LibraryFolder/SearchField.vue
+++ b/client/src/components/LibraryFolder/SearchField.vue
@@ -3,10 +3,10 @@
         <b-form-input
             v-model="search"
             class="mr-1"
-            input="updateSearch($event)"
             type="search"
             id="filterInput"
             placeholder="Search"
+            @keyup.enter="startSeach()"
         />
     </b-input-group>
 </template>
@@ -20,13 +20,17 @@ export default {
             awaitingSearch: false,
         };
     },
-
+    methods: {
+        startSeach() {
+            this.$emit("updateSearch", this.search);
+            this.awaitingSearch = false;
+        },
+    },
     watch: {
         search: function () {
             if (!this.awaitingSearch) {
                 setTimeout(() => {
-                    this.$emit("updateSearch", this.search);
-                    this.awaitingSearch = false;
+                    this.startSeach();
                 }, 1000); // 1 sec delay
             }
             this.awaitingSearch = true;
diff --git a/client/src/components/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/LibraryFolder/TopToolbar/FolderTopBar.vue
index 9508c54f2be..1a3860aa2ed 100644
--- a/client/src/components/LibraryFolder/TopToolbar/FolderTopBar.vue
+++ b/client/src/components/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -7,7 +7,7 @@
                 <font-awesome-icon icon="home" />
             </a>
             <div>
-                <form class="form-inline">
+                <div class="form-inline">
                     <SearchField @updateSearch="updateSearch($event)"></SearchField>
                     <button
                         v-if="metadata.can_add_library_item"
@@ -134,7 +134,7 @@
                             include deleted
                         </b-form-checkbox>
                     </div>
-                </form>
+                </div>
             </div>
         </div>
     </div>