diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c
index acf1a95ac22..1753f9fbcf9 100644
--- a/reactos/lib/user32/windows/defwnd.c
+++ b/reactos/lib/user32/windows/defwnd.c
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.115 2003/12/24 01:26:10 weiden Exp $
+/* $Id: defwnd.c,v 1.116 2003/12/26 01:05:41 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -974,7 +974,6 @@ User32DefWindowProc(HWND hWnd,
             return (DefWndNCLButtonDown(hWnd, wParam, lParam));
         }
 
-        case WM_LBUTTONDBLCLK:
         case WM_NCLBUTTONDBLCLK:
         {
             return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));
diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index 71134dfdccc..c4ffbe84368 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -931,6 +931,8 @@ DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam)
       SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
       break;
     }
+    default:
+      return DefWndNCLButtonDown(hWnd, wParam, lParam);
   }
   return(0);
 }