diff --git a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
index 280e584562..0bc5c3a460 100644
--- a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
@@ -9,6 +9,7 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
   $scope.show_closed = false
   $scope.filtersActive = false
   $scope.distanceMatchesShown = false
+  $scope.closed_shops_loading = false
   $scope.closed_shops_loaded = false
 
   $scope.$watch "query", (query)->
@@ -23,6 +24,7 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
     $timeout ->
       Enterprises.calculateDistance query, $scope.firstNameMatch()
       $rootScope.$broadcast 'enterprisesChanged'
+      $scope.closed_shops_loading = false
 
   $timeout ->
     if $location.search()['show_closed']?
@@ -78,6 +80,7 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
 
   $scope.showClosedShops = ->
     unless $scope.closed_shops_loaded
+      $scope.closed_shops_loading = true
       $scope.closed_shops_loaded = true
       Enterprises.loadClosedEnterprises().then ->
         $scope.resetSearch($scope.query)
diff --git a/app/assets/stylesheets/darkswarm/hubs.css.scss b/app/assets/stylesheets/darkswarm/hubs.css.scss
index 9845ce9ad8..253266eba4 100644
--- a/app/assets/stylesheets/darkswarm/hubs.css.scss
+++ b/app/assets/stylesheets/darkswarm/hubs.css.scss
@@ -14,5 +14,10 @@
 
   .more-controls {
     text-align: center;
+
+    .spinner {
+      height: 2.25em;
+      margin-right: 0.5em;
+    }
   }
 }
diff --git a/app/views/shops/_hubs.html.haml b/app/views/shops/_hubs.html.haml
index a44ae17f8d..6c05561da0 100644
--- a/app/views/shops/_hubs.html.haml
+++ b/app/views/shops/_hubs.html.haml
@@ -26,10 +26,11 @@
         %a{href: "", "ng-click" => "showDistanceMatches()"}
           = t :hubs_distance_filter, location: "{{ nameMatchesFiltered[0].name }}"
   .more-controls
-    %div{ng: {if: "!show_closed", cloak: true}}
+    %img.spinner.text-center{ng: {show: "closed_shops_loading"}, src: "/assets/spinning-circles.svg" }
+    %span{ng: {if: "!show_closed", cloak: true}}
       %a.button{href: "", ng: {click: "showClosedShops()"}}
         = t '.show_closed_shops'
-    %div{ng: {if: "show_closed", cloak: true}}
+    %span{ng: {if: "show_closed", cloak: true}}
       %a.button{href: "", ng: {click: "hideClosedShops()"}}
         = t '.hide_closed_shops'
     %a.button{href: main_app.map_path}= t '.show_on_map'