diff --git a/.gitignore b/.gitignore
index cec4222..06ba399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ bin
 packages
 TestConsoleApp
 .vs
+obj
 **/obj/Debug/**
 **/obj/Release/**
 **/obj/Test/**
\ No newline at end of file
diff --git a/AIProofread/Ribbon1.cs b/AIProofread/Ribbon1.cs
index 481646c..26ae0ac 100644
--- a/AIProofread/Ribbon1.cs
+++ b/AIProofread/Ribbon1.cs
@@ -601,10 +601,10 @@ namespace AIProofread
             btnDetectionAll.Enabled = r.Start == r.End;
         }
 
-        public void SetDetectionBtnStatus(bool status)
+        public void SetDetectionBtnStatus(bool allStatus,bool rangeStatus)
         {
-            btnDetectionAll.Enabled = status;
-            btnDetectionParagraph.Enabled = status;
+            btnDetectionAll.Enabled = allStatus;
+            btnDetectionParagraph.Enabled = rangeStatus;
         }
     }
 }
diff --git a/AIProofread/core/CommonSenseDetection.cs b/AIProofread/core/CommonSenseDetection.cs
index a4aa866..c76b9f4 100644
--- a/AIProofread/core/CommonSenseDetection.cs
+++ b/AIProofread/core/CommonSenseDetection.cs
@@ -64,7 +64,7 @@ namespace AIProofread.core
                 this.checkingKey = checkingKey;
                 this.checkingSummary = checkingSummary;
                 this.checkingLocation = checkingLocation;
-                Globals.ThisAddIn.ribbon.SetDetectionBtnStatus(false);
+                Globals.ThisAddIn.ribbon.SetDetectionBtnStatus(false,false);
             }
             else
             {
@@ -72,7 +72,8 @@ namespace AIProofread.core
                 this.checkingKey = null;
                 this.checkingSummary = null;
                 this.checkingLocation = null;
-                Globals.ThisAddIn.ribbon.SetDetectionBtnStatus(true);
+                var enableAll = string.IsNullOrEmpty(checkingSummary);
+                Globals.ThisAddIn.ribbon.SetDetectionBtnStatus(enableAll,!enableAll);
             }
         }
 
@@ -98,6 +99,11 @@ namespace AIProofread.core
 
         public void Close()
         {
+            if (isChecking)
+            {
+                Globals.ThisAddIn.formCommonsenseDetection.Hide();
+                return;
+            }
             Globals.ThisAddIn.HideDetection();
         }
     }