diff --git a/ChangeLog b/ChangeLog
index 1bbec0840..6ab729a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec  5 18:41:02 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* src/window.h (META_WINDOW_IN_NORMAL_TAB_CHAIN,
+	META_WINDOW_IN_DOCK_TAB_CHAIN) : never use a window with input =
+	FALSE take_focus = FALSE in the	normal and doc tab chains #90409
+
 Thu Dec  5 13:56:52 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
 	* src/display.c (event_callback): move a window to the current
diff --git a/src/window.h b/src/window.h
index c94173bcd..dbdfdf8da 100644
--- a/src/window.h
+++ b/src/window.h
@@ -407,11 +407,12 @@ void meta_window_get_work_area (MetaWindow    *window,
 gboolean meta_window_same_application (MetaWindow *window,
                                        MetaWindow *other_window);
 
-#define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
+#define META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE(w) \
   ((w)->type != META_WINDOW_DOCK && (w)->type != META_WINDOW_DESKTOP)
-
+#define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
+  (((w)->input || (w)->take_focus) && META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w))
 #define META_WINDOW_IN_DOCK_TAB_CHAIN(w) \
-  (! META_WINDOW_IN_NORMAL_TAB_CHAIN (w))
+  (((w)->input || (w)->take_focus) && ! META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w))
 
 void meta_window_refresh_resize_popup (MetaWindow *window);