diff --git a/ChangeLog b/ChangeLog
index 1770d0689..93771833a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-08  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_activate): If we're not passed a
+	timestamp, make sure to manually get one.  Fixes #166728.
+
 2005-02-07  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.9.21
diff --git a/src/window.c b/src/window.c
index 529327d23..947acff3d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2169,8 +2169,10 @@ meta_window_activate (MetaWindow *window,
       return;
     }
   
-  if (timestamp != 0)
-    window->net_wm_user_time = timestamp;
+  if (timestamp == 0)
+    timestamp = meta_display_get_current_time_roundtrip (window->display);
+
+  window->net_wm_user_time = timestamp;
 
   /* disable show desktop mode unless we're a desktop component */
   maybe_leave_show_desktop_mode (window);