diff --git a/ChangeLog b/ChangeLog
index 9766a7af8..3d6d160c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-04  Elijah Newren  <newren@gmail.com>
+
+	Make sure window->border_only is initialized so we don't get
+	random windows without decorations.  Thanks to Sinisa Segvic and
+	Owen Taylor for providing test cases.  Fixes #145131.
+
+	* src/window.c: (update_mwm_hints): Be sure to call
+	recalc_window_features even if no MWM hints are set
+
 2005-02-02  Elijah Newren  <newren@gmail.com>
 
 	Focus parents of dismissed transient windows in preference to the
diff --git a/src/window.c b/src/window.c
index 8416444d4..8317dd788 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4655,6 +4655,7 @@ update_mwm_hints (MetaWindow *window)
                                   &hints))
     {
       meta_verbose ("Window %s has no MWM hints\n", window->desc);
+      recalc_window_features (window);
       return;
     }