diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
index 842afefee6..a89c97791f 100644
--- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
@@ -20,6 +20,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
     $scope.fetchResults()
 
   $scope.fetchResults = (page=1) ->
+    $scope.resetSelected()
     Orders.index({
       'q[completed_at_lt]': $scope['q']['completed_at_lt'],
       'q[completed_at_gt]': $scope['q']['completed_at_gt'],
@@ -39,8 +40,12 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
       page: page
     })
 
+  $scope.resetSelected = ->
+    $scope.selected_orders = {}
+    $scope.selected = false
+    $scope.select_all = false
+
   $scope.toggleAll = ->
-    $scope.select_all = !$scope.select_all
     $scope.orders.forEach (order) ->
       $scope.selected_orders[order.id] = $scope.select_all
 
diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml
index ee1f4adad8..114c177d22 100644
--- a/app/views/spree/admin/orders/index.html.haml
+++ b/app/views/spree/admin/orders/index.html.haml
@@ -28,7 +28,7 @@
   %thead
     %tr
       %th
-        %input{type: 'checkbox', 'ng-click' => 'toggleAll()'}
+        %input{type: 'checkbox', 'ng-click' => 'toggleAll()', 'ng-model' => 'select_all'}
       %th
         = t(:products_distributor)
         %th