diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index ccff7473701..80cf7b08ca4 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-05  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC,
+	User32DefWindowProc): Only send WM_SYSCOMMAND message, not WM_CLOSE.
+	(DefWndHandleSysCommand): Handle SC_CLOSE message.
+
 2003-07-05  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* include/win32k/ntuser.h (NtUserSetFocus): Correct prototype.
diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c
index f026ff69e94..731e975a373 100644
--- a/reactos/lib/user32/windows/defwnd.c
+++ b/reactos/lib/user32/windows/defwnd.c
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.53 2003/07/05 16:04:01 chorns Exp $
+/* $Id: defwnd.c,v 1.54 2003/07/05 17:57:22 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -792,7 +792,6 @@ DefWndHandleLButtonUpNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
         }
         case HTCLOSE:
         {
-            SendMessageA(hWnd, WM_CLOSE, 0, 0);
             SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
             break;
         }
@@ -876,7 +875,17 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
 LRESULT
 DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
 {
-  UNIMPLEMENTED;
+  switch (wParam)
+    {
+      case SC_CLOSE:
+        SendMessageA(hWnd, WM_CLOSE, 0, 0);
+        break;
+      default:
+      /* FIXME: Implement */
+        UNIMPLEMENTED;
+        break;
+    }
+
   return(0);
 }
 
@@ -1385,12 +1394,10 @@ User32DefWindowProc(HWND hWnd,
                 {
                 	if (bUnicode)
                 	  {
-                      PostMessageW(hTopWnd, WM_CLOSE, 0, 0);
                 	    PostMessageW(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
                 	  }
                 	else
                 	  {
-                      PostMessageA(hTopWnd, WM_CLOSE, 0, 0);
                 	    PostMessageA(hTopWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
                 	  }
                 }
diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c
index 958ef8ea518..0c6085ce39c 100644
--- a/reactos/lib/user32/windows/window.c
+++ b/reactos/lib/user32/windows/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.39 2003/06/16 13:46:26 gvg Exp $
+/* $Id: window.c,v 1.40 2003/07/05 17:57:22 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -411,7 +411,6 @@ ChildWindowFromPointEx(HWND hwndParent,
 WINBOOL STDCALL
 CloseWindow(HWND hWnd)
 {
-    SendMessageA(hWnd, WM_CLOSE, 0, 0);
     SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
 
     return (WINBOOL)(hWnd);