diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 6a2147f..b5137e3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -120,13 +120,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $rootScope.isAnnotationWindowOpen = true;
             $(".annotationTollbar").css("display", "block");
             $rootScope.$broadcast('annotationToolEvent', true);
-
+            $("#canvasPaint").css("display", "none");
+            $("#canvas").css("display", "none");
         }
 
         $rootScope.CloseAnnotationTool = function () {
             console.log('close')
             $(".annotationTollbar").css("display", "none");
             $rootScope.isAnnotationWindowClose = true;
+            $("#canvasPaint").css("display", "none");
+            $("#canvas").css("display", "none");
         }
 
         $rootScope.OnIdentifyClick = function () {
@@ -188,6 +191,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawRectangle = function (e) {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Rectangle";
             $('.btnCursor').removeClass('activebtncolor');
@@ -197,6 +202,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.paintBrush = function () {
             //      debugger;
             //  $('.btnCursor').addClass('activebtncolor');
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.switchCanvasToPaintCanvas();
             $rootScope.shapeType = "FreeStylePaint";
             var a = $("#amount-2").val();
@@ -230,6 +237,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawCircle = function (e) {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Circle";
             $('.btnCursor').removeClass('activebtncolor');
@@ -238,6 +247,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawArrow = function (e) {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Arrow";
             $('.btnCursor').removeClass('activebtncolor');
@@ -245,6 +256,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $(".btn-annotation-arrow").addClass("activebtncolor");
         }
         $rootScope.DrawText = function () {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
 
             $rootScope.shapeType = "TextArea";
@@ -256,6 +269,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.DrawPolygon = function () {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
             $rootScope.shapeType = "DrawPolygon";
 
         }
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 853c119..7a4a1bb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -419,7 +419,7 @@
                                 </div>
                                 <div class="btn-group" role="group">
                                     <div id="draw-block"  style="display: none; font-size: 13px;">Draw Mode</div>
-                                    <button id="DrawMode" type="button" class="btn btn-sm btn-success">Draw</button>
+                                    <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
                                 </div>
                             </div>