diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index b767e4e73d6..1a4cff874c5 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -499,15 +499,17 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
     if (isSettingDirty()) {
       BootstrapDialog.confirm({
         title: '',
-        message: 'Changes will be discarded',
+        message: 'Changes will be discarded.',
         callback: function(result) {
           if (result) {
-            $scope.$apply(function () {
+            $scope.$apply(function() {
               $scope.showSetting = false;
             });
           }
         }
       });
+    } else {
+      $scope.showSetting = false;
     }
   };