diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 84b7506..24e426b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -7007,6 +7007,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.LateralArmView = "";
             $scope.MedialArmView = "active";
         }
+        //13573
+        $("#sppeachBubble").remove();
+        $("#bord").remove();
+        $("#dot").remove();
+        $(".com").remove();
+        $rootScope.CloseAnnotationTool();
+      
     }
 
     //Reload DA controller event listener after setting change
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 0f5de1d..2fa024c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -344,6 +344,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.isAnnotaionToolBarDrawingModeActive = false;
       
             $rootScope.switchCanvas();
+            $rootScope.shapeType = '';
         }
         $rootScope.CIAnotationIdentifyModeOff = false;
         $rootScope.OnIdentifyClick = function () {
@@ -1393,6 +1394,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.lastX; $rootScope.lastY;
         var ctx;
         $rootScope.OnPaintCanvasMouseDown = function (event) {
+            
             if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
                 var canvasElement = document.getElementById("canvas");
                 var ctx = canvasElement.getContext("2d");