diff --git a/ui/index.html b/ui/index.html
index cf514fe9..ef16ec38 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -520,12 +520,12 @@
         <div id="tab-content-gallery" class="tab-content">
             <div id="gallery-search">
                 <button class="primaryButton" onclick="decrementGalleryPage()"><i class="fa-solid fa-arrow-left"></i></button>
-                <textarea id="gallery-prompt-search" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a prompt..."></textarea>
-                <textarea id="gallery-model-search" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a model..."></textarea>
+                <input id="gallery-prompt-search" type="text" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a prompt..."></input>
+                <input id="gallery-model-search" type="text" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a model..."></input>
                 <label for="gallery-page">Page:</label>
                 <input id="gallery-page" name="Page" value="0" size="1" onkeypress="gallery_keyDown_handler(event)">
-                <button class="primaryButton" id="gallery-refresh" onclick="refreshGallery()">Load</button>
                 <input id="gallery-thumbnail-size" name="gallery-thumbnail-size" class="editor-slider" type="range" value="300" min="50" max="800">
+                <button class="primaryButton" id="gallery-refresh" onclick="refreshGallery(true)">Load</button>
                 <button class="primaryButton" onclick="incrementGalleryPage()"><i class="fa-solid fa-arrow-right"></i></button>
             </div>
             <div class="gallery">
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3268d119..9259e6c8 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -3254,8 +3254,10 @@ function layoutGallery() {
     })
 }
 
-
-function refreshGallery() {
+function refreshGallery(newsearch = false) {
+    if (newsearch) {
+        document.getElementById("gallery-page").value = 0
+    }
     let container = document.getElementById("imagecontainer")
     container.innerHTML = ""
     let params = new URLSearchParams({
@@ -3278,7 +3280,9 @@ function refreshGallery() {
             // Wait for all images to be loaded
             Promise.all(Array.from(container.querySelectorAll("img")).map(img => {
                 if (img.complete)
+                {
                     return Promise.resolve(img.naturalHeight !== 0)
+                }
                 return new Promise(resolve => {
                     img.addEventListener('load', () => resolve(true))
                     img.addEventListener('error', () => resolve(false))
@@ -3301,17 +3305,17 @@ document.addEventListener("tabClick", (e) => {
 function decrementGalleryPage() {
     let page = Math.max(document.getElementById("gallery-page").value - 1, 0)
     document.getElementById("gallery-page").value = page
-    refreshGallery()
+    refreshGallery(false)
 }
 
 function incrementGalleryPage() {
     document.getElementById("gallery-page").value++
-    refreshGallery()
+    refreshGallery(false)
 }
 
 function gallery_keyDown_handler(event) {
     if (event.key === 'Enter') {
         event.preventDefault()
-        refreshGallery()
+        refreshGallery(true)
     }
 }