diff --git a/layerindex/views.py b/layerindex/views.py
index 51b7a81..03886b1 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -844,6 +844,7 @@ class EditProfileFormView(SuccessMessageMixin, UpdateView):
         else:
             error_fields = form.errors.keys()
         context['error_fields'] = error_fields
+        context['return_url'] = self.get_success_url()
         return context
 
     def get_object(self, queryset=None):
@@ -870,7 +871,7 @@ class EditProfileFormView(SuccessMessageMixin, UpdateView):
         return "Profile saved successfully"
 
     def get_success_url(self):
-        return reverse('frontpage')
+        return self.request.GET.get('return_to', reverse('frontpage'))
 
 
 @receiver(pre_save, sender=reversion.models.Version)
diff --git a/templates/base.html b/templates/base.html
index 5fa38b8..60d2f3d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -54,7 +54,7 @@
                         <ul class="dropdown-menu">
                             <li><a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a></li>
                             <li><a href="{% url 'auth_password_change' %}">{% trans "Change password" %}</a></li>
-                            <li><a href="{% url 'profile' %}">{% trans "Edit profile" %}</a></li>
+                            <li><a href="{% url 'profile' %}?return_to={{ request.path }}">{% trans "Edit profile" %}</a></li>
                         </ul>
                     </div>
                 {% else %}
diff --git a/templates/layerindex/profile.html b/templates/layerindex/profile.html
index 212cf51..04794ce 100644
--- a/templates/layerindex/profile.html
+++ b/templates/layerindex/profile.html
@@ -42,7 +42,7 @@
     {% endfor %}
 
   <input type="submit" class="btn btn-default" value="{% trans 'Save' %}" />
-  <a class="btn btn-default" href="{% url 'frontpage' %}">{% trans 'Cancel' %}</a>
+  <a class="btn btn-default" href="{{ return_url }}">{% trans 'Cancel' %}</a>
   <a class="btn btn-danger" href="{% url 'delete_account' %}">{% trans 'Delete account' %}</a>
   {% csrf_token %}
 </form>