diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index ee6e9c625c..d4078e56c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -13,8 +13,10 @@
             menu="page.menu"
             hide-icon="true"
             hide-description="true"
-            hide-alias="true">
-         </umb-editor-header>
+            hide-alias="true"
+            show-back-button="showBack()"
+            on-back="onBack()">
+          </umb-editor-header>
 
          <umb-editor-container class="form-horizontal">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index bf32f83c4e..6d5bc9036c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -15,14 +15,9 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
     $scope.page.menu.currentSection = appState.getSectionState("currentSection");
     $scope.page.menu.currentNode = null; //the editors affiliated node
     $scope.page.nameLocked = false;
-    $scope.page.listViewPath = null;
     $scope.page.saveButtonState = "init";
     $scope.page.exportButton = "init";
 
-    $scope.page.listViewPath = ($routeParams.page && $routeParams.listName)
-        ? "/member/member/list/" + $routeParams.listName + "?page=" + $routeParams.page
-        : null;
-
     //build a path to sync the tree with
     function buildTreePath(data) {
         return $routeParams.listName ? "-1," + $routeParams.listName : "-1";
@@ -192,6 +187,19 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
     };
 
+    $scope.showBack = function () {
+        return !!$routeParams.listName;
+    }
+
+    /** Callback for when user clicks the back-icon */
+    $scope.onBack = function () {
+        $location.path("/member/member/list/" + $routeParams.listName);
+        $location.search("listName", null);
+        if ($routeParams.page) {
+            $location.search("page", $routeParams.page);
+        }
+    };
+
     $scope.export = function() {
         var memberKey = $scope.content.key;
         memberResource.exportMemberData(memberKey);