diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index 502a1ec..6af77ca 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -372,7 +372,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
     $scope.openView = function ($event) {
         $rootScope.disableAnnotationTBFn();
-      
+        $rootScope.MenuModuleName = "CA";
+        //alert($rootScope.MenuModuleName);
         $rootScope.currentBodyViewId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
             var CITitle = [];
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index c9b5de9..5190381 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -266,6 +266,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.openView = function ($event) {
         $rootScope.disableAnnotationTB = false;
+        $rootScope.MenuModuleName = "DA";
+        //alert($rootScope.MenuModuleName);
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
 
@@ -6839,11 +6841,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     //list manager
     $scope.$on('listManagerEvent', function (event, data) {
-        
-        if ($rootScope.disableAnnotationtoolOnListManager == true)
-        {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
-            $('#slider-range-min-2').slider('disable');
+       
+        //if ($rootScope.MenuModuleName == "DA") {
+        //    if ($rootScope.disableAnnotationtoolOnListManager == true) {
+        //        $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+        //        $('#slider-range-min-2').slider('disable');
+        //    }
+        //} 
             if ($rootScope.setListManagerZindex == true)
             {
                 var canvasPaintZindex = $('#canvasPaint').css("z-index");  //x
@@ -6865,7 +6869,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
                
             }
-        }
+        
       
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index f6a286a..1ccfff6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -169,7 +169,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
             //7904
-
+            if ($rootScope.MenuModuleName == "DA") {
+                if ($rootScope.disableAnnotationtoolOnListManager == true) {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('disable');
+                    
+                 //   $rootScope.disableAnnotationTB = false;
+                }else
+                {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('enable');
+                }
+               // document.getElementById('modelbackground').style.display = "block";
+               // document.getElementById('modeleditstyle').style.display = "block";
+             
+            }
             $("#OnIdentify").addClass("annotationtoolbartab");
             $("#annotationToolBarOptions").addClass("active");
             $("#annotationButton").addClass("active");
@@ -1824,7 +1838,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             console.log('ShowListManager')
 
             $rootScope.disableAnnotationtoolOnListManager = true;
-
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+            $('#slider-range-min-2').slider('disable');
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
 
@@ -1840,13 +1855,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
         $rootScope.CloseListManager = function () {
             console.log('close')
-            
             $rootScope.disableAnnotationtoolOnListManager = false;
-            if ($rootScope.disableAnnotationtoolOnListManager == false) {
-                $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
-                $('#slider-range-min-2').slider('enable');
+            if ($rootScope.MenuModuleName == "DA") {
+               
+                if ($rootScope.disableAnnotationtoolOnListManager == false) {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('enable');
+                }
             }
-            //$rootScope.isListManagerSelected = false;
             $('#listManager').css('display', 'none');
             $("#listManager").css("visibility", "hidden");