diff --git a/src/bin/clapper-app/clapper-app-window.c b/src/bin/clapper-app/clapper-app-window.c
index 04145119..68bf5a30 100644
--- a/src/bin/clapper-app/clapper-app-window.c
+++ b/src/bin/clapper-app/clapper-app-window.c
@@ -1291,11 +1291,15 @@ clapper_app_window_constructed (GObject *object)
   gst_object_unref (feature);
 #endif
 
+  if ((proxy = clapper_enhancer_proxy_list_get_proxy_by_module (proxies, "clapper-media-scanner"))) {
+    gst_object_unref (proxy);
+  } else {
 #if CLAPPER_HAVE_DISCOVERER
-  feature = CLAPPER_FEATURE (clapper_discoverer_new ());
-  clapper_player_add_feature (player, feature);
-  gst_object_unref (feature);
+    feature = CLAPPER_FEATURE (clapper_discoverer_new ());
+    clapper_player_add_feature (player, feature);
+    gst_object_unref (feature);
 #endif
+  }
 
   /* FIXME: Allow setting sink/filter elements from prefs window
    * (this should include parsing bin descriptions) */