diff --git a/layerindex/editlayer.html b/layerindex/editlayer.html
index 1653b0b..13178b0 100644
--- a/layerindex/editlayer.html
+++ b/layerindex/editlayer.html
@@ -14,6 +14,11 @@
 {% block title %}OpenEmbedded metadata index - edit layer{% endblock %}
 -->
 
+{% block submitlink %}
+<!-- Remove submit link added by base.html, otherwise clicking it may lose changes -->
+{% endblock %}
+
+
 {% block content %}
 {% autoescape on %}
 
diff --git a/layerindex/submitlayer.html b/layerindex/submitlayer.html
index f83375d..6950da9 100644
--- a/layerindex/submitlayer.html
+++ b/layerindex/submitlayer.html
@@ -21,11 +21,6 @@
         {% endblock %}
 
 
-{% block submitlink %}
-<!-- Disable submit link, otherwise clicking it will blank the form! -->
-<li><a href="#">Submit layer</a></li>
-{% endblock %}
-
 {% block formtag %}
 <form id="edit_layer_form" action="{% url submit_layer %}" method="post">
 {% endblock %}