diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 566106e0c..e7454de3a 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -321,8 +321,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 				extractor.delegate = self
 				extractor.process()
 				articleExtractor = extractor
-				makeToolbarValidate()
 			}
+			makeToolbarValidate()
 		}
 		
 	}
@@ -695,6 +695,7 @@ private extension MainWindowController {
 		guard let articleExtractorState = articleExtractor?.state else {
 			articleExtractorButton.isError = false
 			articleExtractorButton.isInProgress = false
+			articleExtractorButton.state = .off
 			return currentLink != nil
 		}