diff --git a/TODO b/TODO
index 6f7b586..0f9ebbe 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,6 @@ Later:
 * Usage links in list page?
 * Subdirs in list page?
 * Avoid page content changing size depending on whether scrollbar is there or not?
-* Cancel button on edit form?
 * Query backend service? i.e. special URL to query information for external apps/scripts
 * Add comparison to duplicates page
 * Dynamic loading/filtering for recipes list
diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index c62b462..532176f 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -135,6 +135,10 @@ padding: 8px;
     border-top: 1px solid rgb(238, 238, 238);
 }
 
+.submitbutton {
+    margin-right: 5px;
+}
+
 .hero-evenlyspaced {
     padding: 35px;
 }
diff --git a/layerindex/views.py b/layerindex/views.py
index 3544e2c..e3bc9a8 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -84,6 +84,7 @@ def delete_layer_view(request, template_name, slug):
         })
 
 def edit_layer_view(request, template_name, slug=None):
+    return_url = None
     if slug:
         # Edit mode
         branch = Branch.objects.filter(name=request.session.get('branch', 'master'))[:1].get()
@@ -92,6 +93,9 @@ def edit_layer_view(request, template_name, slug=None):
             raise PermissionDenied
         layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branch)
         deplistlayers = LayerItem.objects.exclude(id=layeritem.id).order_by('name')
+        returnto = request.GET.get('returnto', 'layer_item')
+        if returnto:
+            return_url = reverse_lazy(returnto, args=(layeritem.name,))
     else:
         # Submit mode
         branch = Branch.objects.filter(name='master')[:1].get()
@@ -165,9 +169,8 @@ def edit_layer_view(request, template_name, slug=None):
                         msg.send()
                     return HttpResponseRedirect(reverse('submit_layer_thanks'))
             messages.success(request, 'Layer %s saved successfully.' % layeritem.name)
-            returnto = request.GET.get('returnto', 'layer_item')
-            if returnto:
-                return HttpResponseRedirect(reverse_lazy(returnto, args=(layeritem.name,)))
+            if return_url:
+                return HttpResponseRedirect(return_url)
     else:
         form = EditLayerForm(request.user, layerbranch, instance=layeritem)
         maintainerformset = LayerMaintainerFormSet(instance=layerbranch)
@@ -176,6 +179,7 @@ def edit_layer_view(request, template_name, slug=None):
         'form': form,
         'maintainerformset': maintainerformset,
         'deplistlayers': deplistlayers,
+        'return_url': return_url,
     })
 
 def bulk_change_edit_view(request, template_name, pk):
diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html
index 714a89a..8e524d3 100644
--- a/templates/layerindex/editlayer.html
+++ b/templates/layerindex/editlayer.html
@@ -147,7 +147,8 @@
 
 <div class="submitbuttons">
 {% block submitbuttons %}
-<input type="submit" value="Save layer" class="btn btn-primary btn-large" />
+<input type="submit" value="Save layer" class="btn btn-primary btn-large submitbutton" />
+<a href="{{ return_url }}" class="btn btn-large">Cancel</a>
 {% endblock %}
 </div>
 </form>