diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 1e95b5882..4a5d3a2e6 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -259,10 +259,8 @@ window_is_tracked (MetaWindow *window)
 gboolean
 shell_window_tracker_is_window_interesting (MetaWindow *window)
 {
-  if (!window_is_tracked (window))
-    return FALSE;
-
-  if (meta_window_is_skip_taskbar (window))
+  if (meta_window_is_override_redirect (window)
+      || meta_window_is_skip_taskbar (window))
     return FALSE;
 
   switch (meta_window_get_window_type (window))
@@ -396,6 +394,9 @@ get_app_for_window (ShellWindowTracker    *monitor,
   ShellApp *result;
   const char *startup_id;
 
+  if (meta_window_is_remote (window))
+    return shell_app_system_get_app_for_window (shell_app_system_get_default (), window);
+
   result = NULL;
   /* First, we check whether we already know about this window,
    * if so, just return that.