diff --git a/src/views/search.ecr b/src/views/search.ecr
index 557a90684..2bc54239d 100644
--- a/src/views/search.ecr
+++ b/src/views/search.ecr
@@ -2,22 +2,19 @@
 <title><%= query.size > 30 ? query[0,30].rstrip(".") + "..." : query %> - Invidious</title>
 <% end %>
 
-<% videos.each do |video| %>
-<p style="padding:1em;">
-    <div class="pure-g">
-        <div class="pure-u-1 pure-u-md-1-5">
-            <a class="link" href="<%= video["link"] %>">
-                <img style="width:100%" alt="thumbnail" src="<%= video["thumbnail"] %>">
-            </a>
-        </div>
-        <div class="pure-u-1 pure-u-md-4-5">
-            <a style="display:block; width:100%; height:100%" class="link" href="<%= video["link"] %>">
+<% videos.each_slice(4) do |slice| %>
+<div class="pure-g">
+<% slice.each do |video| %>
+    <div class="pure-u-1 pure-u-md-1-4">
+        <div style="margin: 1em;">
+            <a style="width:100%;" class="link" href="/watch?v=<%= video["link"] %>">
+                <img style="width:100%" src="<%= video["thumbnail"] %>"/>
                 <%= video["title"] %>
             </a>
         </div>
     </div>
-    </a>
-</p>
+    <% end %>
+</div>
 <% end %>
 
 <p style="text-align: right">