diff --git a/windows/nonclient.c b/windows/nonclient.c
index 327b4e6..87acf69 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -96,9 +96,11 @@
  */
 BOOL WIN_WindowNeedsWMBorder( DWORD style, DWORD exStyle )
 {
-    if (!(style & WS_CHILD) && Options.managed  &&
-        (((style & WS_CAPTION) == WS_CAPTION) ||
-         (style & WS_THICKFRAME)))
+    if (!(style & WS_CHILD) && 
+	Options.managed  &&
+	!(exStyle & WS_EX_TOOLWINDOW) &&
+        ( ((style & WS_CAPTION) == WS_CAPTION) ||
+	  (style & WS_THICKFRAME)))
         return TRUE;
     return FALSE;
 }