diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index 2077a456..fb4a8db7 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -413,7 +413,7 @@ class MainFrameModel {
                         break
                     if (parent.getChildCount() == 0) {
                         File file = parent.getUserObject().file
-                        if (core.muOptions.watchedDirectories.contains(file.toString()))
+                        if (core.watchedDirectoryManager.isWatched(file))
                             unshared.add(file)
                         dmtn = parent
                         continue
diff --git a/webui/src/main/java/com/muwire/webui/FileManager.java b/webui/src/main/java/com/muwire/webui/FileManager.java
index f5d9fc9a..67a5329d 100644
--- a/webui/src/main/java/com/muwire/webui/FileManager.java
+++ b/webui/src/main/java/com/muwire/webui/FileManager.java
@@ -134,14 +134,14 @@ public class FileManager {
             }
             
             for (File directory : cb.directories) {
-                if (core.getMuOptions().getWatchedDirectories().contains(directory.getAbsolutePath())) {
+                if (core.getWatchedDirectoryManager().isWatched(directory)) {
                     DirectoryUnsharedEvent e = new DirectoryUnsharedEvent();
                     e.setDirectory(directory);
                     core.getEventBus().publish(e);
                 }
             }
             
-            if (core.getMuOptions().getWatchedDirectories().contains(file.getAbsolutePath())) {
+            if (core.getWatchedDirectoryManager().isWatched(file)) {
                 DirectoryUnsharedEvent event = new DirectoryUnsharedEvent();
                 event.setDirectory(file);
                 core.getEventBus().publish(event);