diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 22e03d63..9aff8aff 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -297,6 +297,11 @@ namespace SparkleLib {
         // Starts a timer when something changes
         public void OnFileActivity (FileSystemEventArgs args)
         {
+            // Check the watcher for the occasions where this
+            // method is called directly
+            if (!this.watcher.EnableRaisingEvents)
+                return;
+
             if (args.FullPath.Contains (Path.DirectorySeparatorChar + "."))
                 return;