diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 4f32134..f778fa5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -429,8 +429,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
     })
     $rootScope.aaPinDataArray = [];
+    $rootScope.isShowSelectedSystemPinsClicked = false;
     $scope.showAllPins = function () {
-       
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
 
@@ -456,11 +456,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         $scope.allPinDataArray.push(value._PinId);
                         $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
                     })
+                   
+                   
+                    if ($rootScope.isShowSelectedSystemPinsClicked == false) {
+                        $rootScope.isShowSelectedSystemPinsClicked = true;
+                        //load search/vocab data
+                        $rootScope.loadSearchData();    
+                    }
+                    else {
+                        $rootScope.isLoading = false;
+                        $('#spinner').css('visibility', 'hidden');
+                    }
 
-
-
-                    //load search/vocab data
-                    $rootScope.loadSearchData();
+                  
                 }
             },
              function (error) {
@@ -682,6 +690,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
 
     $scope.showSelectedSystemPins = function (event) {
+        $rootScope.isShowSelectedSystemPinsClicked = true;
         var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
         var bodySystemListlength = bodySystemListObj.length;
         for (var i = 0; i < bodySystemListlength; i++) {