diff --git a/public/theme/default.css b/public/theme/default.css
index 0a8a8c1..373ac03 100644
--- a/public/theme/default.css
+++ b/public/theme/default.css
@@ -122,6 +122,7 @@ header > form > input[type="text"]:focus, form textarea:focus {
 
 header > form > input[type="submit"] {
     cursor: pointer;
+    margin-left: 8px;
     padding: 8px 16px;
 }
 
diff --git a/templates/layout.html.tera b/templates/layout.html.tera
index 1580ec0..3cdc628 100644
--- a/templates/layout.html.tera
+++ b/templates/layout.html.tera
@@ -14,8 +14,8 @@
             {% if description %}<p>{{ description }}</p>{% endif %}
             <form action="/" method="GET">
                 {% if token %}<input type="hidden" name="token" value="{{ token }}" />{% endif %}
-                <input type="text" name="search" value="{% if search %}{{ search }}{% endif %}" placeholder="Search..." />
-                <input type="submit" value="Search" />
+                <input type="text" name="search" value="{% if search %}{{ search }}{% endif %}" placeholder="Search..."
+                /><input type="submit" value="Search" />
             </form>
             <div>
                 <a href="/rss">RSS</a> |