diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index e211218ce1..0dda0d4a96 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -248,13 +248,12 @@
 
         function setSorting(field, allow, options) {
             if (allow) {
-                options.orderBy = field;
-
-                if (options.orderDirection === "desc") {
-                    options.orderDirection = "asc";
-                } else {
+                if (options.orderBy === field && options.orderDirection === 'asc') {
                     options.orderDirection = "desc";
+                } else {
+                    options.orderDirection = "asc";
                 }
+                options.orderBy = field;
             }
         }
         
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index 8d9b45e6be..fb5e992d81 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -10,7 +10,7 @@
                            ng-checked="isSelectedAll()">
                 </div>
                 <div class="umb-table-cell umb-table__name">
-                    <a class="umb-table-head__link sortable" href="#" ng-click="sort('Name', true)" prevent-default>
+                    <a class="umb-table-head__link sortable" href="#" ng-click="sort('Name', true, true)" prevent-default>
                         <localize key="general_name">Name</localize>
                         <i class="umb-table-head__icon icon" ng-class="{'icon-navigation-up': isSortDirection('Name', 'asc'), 'icon-navigation-down': isSortDirection('Name', 'desc')}"></i>
                     </a>