diff --git a/app/assets/javascripts/controllers/queriesCtrl.js b/app/assets/javascripts/controllers/queriesCtrl.js
index 4b9201541..4f16a92de 100644
--- a/app/assets/javascripts/controllers/queriesCtrl.js
+++ b/app/assets/javascripts/controllers/queriesCtrl.js
@@ -329,7 +329,6 @@ angular.module('QuepidApp')
       function pickCaseScorer() {
         var modalInstance = $uibModal.open({
           templateUrl: 'views/pick_scorer.html',
-          backdrop:    'static',
           controller:  'ScorerCtrl',
           resolve:     {
             parent: function() {
diff --git a/app/assets/javascripts/controllers/scorer.js b/app/assets/javascripts/controllers/scorer.js
index e72f5e4df..3a90afaec 100644
--- a/app/assets/javascripts/controllers/scorer.js
+++ b/app/assets/javascripts/controllers/scorer.js
@@ -18,7 +18,7 @@ angular.module('QuepidApp')
       $scope.gotoScorers        = gotoScorers;
       $scope.ok                 = ok;
       $scope.scorers            = [];
-      $scope.communalScorers    = [];
+      $scope.communalScorers    = [];     
       $scope.selectScorer       = selectScorer;
       $scope.usingDefaultScorer = usingDefaultScorer;
       $scope.communalScorersOnly = configurationSvc.isCommunalScorersOnly();
@@ -26,12 +26,13 @@ angular.module('QuepidApp')
       if ($scope.activeScorer.scorerId && ($scope.activeScorer.scorerId !== 'default')) {
         $scope.activeScorer.scorerId = parseInt($scope.activeScorer.scorerId);
       }
-
+     
       /*jslint latedef:false*/
       scorerSvc.list()
         .then(function() {
           $scope.userScorers     = scorerSvc.scorers;
           $scope.communalScorers = scorerSvc.communalScorers;
+           $scope.scorerAccessible = scorerAccessible();
         });
 
       function cancel() {
@@ -48,6 +49,21 @@ angular.module('QuepidApp')
 
         $uibModalInstance.close($scope.activeScorer);
       }
+      
+      function scorerAccessible() {
+        let scorerAccessible = false;
+        
+        if ($scope.activeScorer.scorerId) {
+          angular.forEach($scope.userScorers.concat($scope.communalScorers), function (scorer){
+            if (scorer.scorerId === $scope.activeScorer.scorerId){
+              scorerAccessible = true;
+              return scorerAccessible;
+            }
+          });
+        }
+        return scorerAccessible;        
+        
+      }
 
       function selectScorer(scorer) {
         var name = (!scorer ? 'none' : scorer.name);
diff --git a/app/assets/templates/views/pick_scorer.html b/app/assets/templates/views/pick_scorer.html
index b95122f79..4abdf23d1 100644
--- a/app/assets/templates/views/pick_scorer.html
+++ b/app/assets/templates/views/pick_scorer.html
@@ -3,6 +3,9 @@
   <h3 class="modal-title">How would you like to score this case?</h3>
 </div>
 <div class="modal-body">
+  <div ng-if="!scorerAccessible" class="alert alert-warning" role="alert">
+    The scorer {{activeScorer.name}} used by this case is NOT shared via a team with you, so if you switch away from it you won't have access to it again.
+  </div>
   <div class="row" style="max-height:300px;overflow-y:auto">
     <h4>Select from defaults:</h4>
     <ul class="list-group">