diff --git a/ChangeLog b/ChangeLog
index 2fa0a08c5..c04ac7d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-09  Elijah Newren  <newren@gmail.com>
+
+	* src/edge-resistance.c (apply_edge_resistance): Make extra
+	timeout edge resistance apply even if one edge already offscreen.
+	Fixes another of the zillions of issues covered in #321905.
+
 2006-01-09  Elijah Newren  <newren@gmail.com>
 
 	Allow edge resistance at both sides of a window and also when
diff --git a/src/edge-resistance.c b/src/edge-resistance.c
index 40979beba..443b8cba7 100644
--- a/src/edge-resistance.c
+++ b/src/edge-resistance.c
@@ -495,12 +495,10 @@ apply_edge_resistance (MetaWindow                *window,
                   timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_WINDOW;
                   break;
                 case META_EDGE_XINERAMA:
-                  if (window->require_on_single_xinerama)
-                    timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_XINERAMA;
+                  timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_XINERAMA;
                   break;
                 case META_EDGE_SCREEN:
-                  if (window->require_fully_onscreen)
-                    timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_SCREEN;
+                  timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_SCREEN;
                   break;
                 }