diff --git a/base.html b/base.html
index fb860bd..3945b2d 100644
--- a/base.html
+++ b/base.html
@@ -29,7 +29,7 @@
                 <a class="brand" href="{% url layer_list %}">OpenEmbedded metadata index</a>
 
                 <ul class="nav pull-right">
-                    <li><a href="{% url submit_layer %}">Submit layer</a></li>
+                    {% block submitlink %}<li><a href="{% url submit_layer %}">Submit layer</a></li>{% endblock %}
                     {% if user.is_authenticated %}
                     {% if perms.layeritem.publish_layer %}
                         <li><a href="{% url layer_list_review %}">Review</a></li>
diff --git a/layerindex/submitlayer.html b/layerindex/submitlayer.html
index e0b824f..0c53e59 100644
--- a/layerindex/submitlayer.html
+++ b/layerindex/submitlayer.html
@@ -15,6 +15,11 @@
 {% block title %}OpenEmbedded metadata index - submit layer{% endblock %}
 -->
 
+{% block submitlink %}
+<!-- Disable submit link, otherwise clicking it will blank the form! -->
+<li><a href="#">Submit layer</a></li>
+{% endblock %}
+
 {% block content %}
 {% autoescape on %}