diff --git a/src/app_watcher.rb b/src/app_watcher.rb
index c47a91ca..0b677faa 100644
--- a/src/app_watcher.rb
+++ b/src/app_watcher.rb
@@ -27,8 +27,14 @@ def stop
 
 
   def custom_watcher(dir, extensions, callback)
-    filter = File.join(dir, extensions)
-    child_filter = File.join(dir, "**", extensions)
+    
+    if dir.nil? or dir.empty?
+      filter = extensions
+      child_filter = File.join("**", extensions)
+    else
+      filter = File.join(dir, extensions)
+      child_filter = File.join(dir, "**", extensions)
+    end
 
     #[Compass::Configuration::Watch.new(filter, &callback),
     # Compass::Configuration::Watch.new(child_filter, &callback)]