diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index e3ec785..502a1ec 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -406,7 +406,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
        
         if ($rootScope.disableAnnotationTB == true)
         {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
             $('#slider-range-min-2').slider('disable');
         }
         $rootScope.isLoading = true;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index e3c666b..f5faba1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -431,7 +431,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
    
     $scope.openView = function ($event) {
-
+        $rootScope.disableAnnotationTB = false;
         $rootScope.CIAnotationIdentifyModeOff = true;
         $rootScope.currentBodyViewId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 7617a02..5f41a9e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -265,7 +265,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
     $scope.openView = function ($event) {
-
+        $rootScope.disableAnnotationTB = false;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
 
@@ -6836,7 +6836,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         
         if ($rootScope.disableAnnotationtoolOnListManager == true)
         {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
             $('#slider-range-min-2').slider('disable');
             if ($rootScope.setListManagerZindex == true)
             {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 4e74980..f2b9de8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -473,16 +473,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.enableAnnotationToolBar = function () {
-           
-            document.getElementById('modelbackground').style.display = "block";
-            //$("#editshapestyle").modal('show');
-            document.getElementById('modeleditstyle').style.display = "block";
-            if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
-                var previewOpacity = $('#imgOpacity').css("opacity");
-                $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%");
-                $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
-               
-            };
+            if ($rootScope.disableAnnotationTB == true) {
+                document.getElementById('modelbackground').style.display = "none";
+                //$("#editshapestyle").modal('show');
+                document.getElementById('modeleditstyle').style.display = "none";
+            }
+            else {
+                document.getElementById('modelbackground').style.display = "block";
+                //$("#editshapestyle").modal('show');
+                document.getElementById('modeleditstyle').style.display = "block";
+                if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
+                    var previewOpacity = $('#imgOpacity').css("opacity");
+                    $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%");
+                    $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
+
+                };
+            }
         }
 
 
@@ -1818,6 +1824,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.disableAnnotationtoolOnListManager = false;
         $rootScope.ShowListManager = function () {
             console.log('ShowListManager')
+
             $rootScope.disableAnnotationtoolOnListManager = true;
 
             $rootScope.isLoading = true;