diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index ce1a73fe6d..13e3853458 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -166,6 +166,10 @@
   color: @black;
 }
 
+.umb-listview .pagination ul > li.disabled > a, .umb-listview .pagination ul > li.disabled > a:hover {
+  color: @grayLight;
+}
+
 /* TEMP */
 
 .umb-listview .table-striped tbody td {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 8c24404bde..379504cf71 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -80,7 +80,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
         contentResource.getChildren(id, $scope.options).then(function (data) {
 
             $scope.listViewResultSet = data;
-            $scope.pagination = [];
+            $scope.pagination = [];            
 
             for (var i = $scope.listViewResultSet.totalPages - 1; i >= 0; i--) {
                 $scope.pagination[i] = { index: i, name: i + 1 };
@@ -94,7 +94,8 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
     };
 
     //assign debounce method to the search to limit the queries
-    $scope.search = _.debounce(function() {
+    $scope.search = _.debounce(function () {
+        $scope.options.pageNumber = 1;
         $scope.reloadView($scope.contentId);
     }, 100);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index c87303e648..57b7eff7c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -95,18 +95,22 @@
                         </div>
                         <div class="pagination pagination-right">
                             <ul>
-                                <li><a href="#" ng-click="prev()" prevent-default>
-                                    <localize key="general_previous">Previous</localize>
-                                </a></li>
+                                <li ng-class="{disabled:options.pageNumber <= 1}">
+                                    <a href="#" ng-click="prev()" prevent-default>
+                                        <localize key="general_previous">Previous</localize>
+                                    </a>
+                                </li>
 
                                 <li ng-repeat="pgn in pagination track by $index"
-                                    ng-class="{active:$index==options.offset}">
+                                    ng-class="{active:$index + 1 == options.pageNumber}">
                                     <a href="#" ng-click="goToPage($index)" prevent-default>{{$index + 1}}</a>
                                 </li>
 
-                                <li><a href="#" ng-click="next()" prevent-default>
-                                    <localize key="general_next">Next</localize>
-                                </a></li>
+                                <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
+                                    <a href="#" ng-click="next()" prevent-default>
+                                        <localize key="general_next">Next</localize>
+                                    </a>
+                                </li>
                             </ul>
                         </div>