diff --git a/src/main/kotlin/uk/co/neviyn/booru/Controller.kt b/src/main/kotlin/uk/co/neviyn/booru/Controller.kt
index bb916d6..9fa4554 100644
--- a/src/main/kotlin/uk/co/neviyn/booru/Controller.kt
+++ b/src/main/kotlin/uk/co/neviyn/booru/Controller.kt
@@ -73,7 +73,7 @@ class ImageController
                     }
                 }
             }
-        } ?: return "noresults"
+        } ?: return "gallery"
         model.addAttribute("imagePage", images)
         return "gallery"
     }
diff --git a/src/main/resources/templates/gallery.html b/src/main/resources/templates/gallery.html
index 1e4f157..eeb698e 100644
--- a/src/main/resources/templates/gallery.html
+++ b/src/main/resources/templates/gallery.html
@@ -7,13 +7,31 @@
 <body>
 <div th:replace="fragments :: navbar"></div>
 <div class="container">
-    <div class="row">
-        <div class="col-2" th:each="image : ${imagePage.content}">
-            <!--/*@thymesVar id="image" type="uk.co.neviyn.booru.Image"*/-->
-            <img class="img-thumbnail" th:src="'/i/' + ${image.filename}"  alt=""/>
+    <form action="/gallery" class="text-center row row-cols-auto align-items-center mt-2">
+        <div class="col-10">
+            <!--suppress HtmlFormInputWithoutLabel -->
+            <input class="form-control" id="imageSearch"
+                   name="tags"
+                   pattern="[a-zA-Z0-9\s_]*"
+                   placeholder="Ex: blue_eyes smile"
+                   th:value="${#request.getParameter('tags')}"
+                   type="search">
         </div>
+        <div class="col-2 d-grid">
+            <button class="btn btn-primary" type="submit">Search</button>
+        </div>
+    </form>
+</div>
+<div class="row" th:if="${imagePage != null}">
+    <div class="col-2" th:each="image : ${imagePage.content}">
+        <!--/*@thymesVar id="image" type="uk.co.neviyn.booru.Image"*/-->
+        <img alt="" class="img-thumbnail" th:src="'/i/' + ${image.filename}"/>
+    </div>
+</div>
+<div class="row" th:if="${imagePage == null}">
+    <div class="col text-center mt-3">
+        <p class="lead">No images found with all the specified tags.</p>
     </div>
 </div>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/noresults.html b/src/main/resources/templates/noresults.html
deleted file mode 100644
index 1f41476..0000000
--- a/src/main/resources/templates/noresults.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta th:replace="fragments :: header"/>
-    <title>No Images Found</title>
-</head>
-<body>
-<div class="container">
-    <div class="row">
-        <div class="col text-center">
-            <p>Couldn't find any images with those tags.</p>
-        </div>
-    </div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
