diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index dc05e8d5aff..4b29de0bf09 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,7 +1,7 @@
 2003-09-09  Martin Fuchs	<martin-fuchs@gmx.net>
 	
-	* include/func.h: added GetShellWindow() since it's now contained in the MS Platform SDK headers
-	* lib/user32/misc/desktop.c: implemented GetShellWindow() and SetShellWindow().
+	* include/func.h: added GetShellWindow()
+	* lib/user32/misc/desktop.c: implemented GetShellWindow(), SetShellWindow() and SetShellWindowEx().
 	* lib/user32/user32.def: Ditto.
 	* lib/user32/user32.edf: Ditto.
 
diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c
index 7551907c348..82aa512a1ae 100644
--- a/reactos/lib/user32/misc/desktop.c
+++ b/reactos/lib/user32/misc/desktop.c
@@ -1,4 +1,4 @@
-/* $Id: desktop.c,v 1.19 2003/08/09 08:57:13 mf Exp $
+/* $Id: desktop.c,v 1.20 2003/08/09 13:13:43 mf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -307,8 +307,9 @@ SwitchDesktop(
 }
 
 
- /* globally stored handle to the shell window */
+ /* globally stored handles to the shell windows */
 HWND hwndShellWindow = 0;
+HWND hwndShellListView = 0;
 DWORD pidShellWindow = 0;
 
 
@@ -326,15 +327,16 @@ GetShellWindow(VOID)
  * @implemented
  */
 BOOL STDCALL
-SetShellWindow(HWND hwnd)
+SetShellWindowEx(HWND hwndShell, HWND hwndShellListView)
 {
 	 /* test if we are permitted to change the shell window */
 	if (pidShellWindow && GetCurrentProcessId()!=pidShellWindow)
 		return FALSE;
 
-	hwndShellWindow = hwnd;
+	hwndShellWindow = hwndShell;
+	hwndShellListView = hwndShellListView;
 
-	if (hwnd)
+	if (hwndShell)
 		pidShellWindow = GetCurrentProcessId();	/* request shell window for the calling process */
 	else
 		pidShellWindow = 0;	/* shell window is now free for other processes. */
@@ -342,4 +344,14 @@ SetShellWindow(HWND hwnd)
 	return TRUE;
 }
 
+
+/*
+ * @implemented
+ */
+BOOL STDCALL
+SetShellWindow(HWND hwndShell)
+{
+	return SetShellWindowEx(hwndShell, 0);
+}
+
 /* EOF */
diff --git a/reactos/lib/user32/user32.def b/reactos/lib/user32/user32.def
index e0368e571fb..da6a4696dfa 100644
--- a/reactos/lib/user32/user32.def
+++ b/reactos/lib/user32/user32.def
@@ -592,7 +592,7 @@ SetScrollInfo@16
 SetScrollPos@16
 SetScrollRange@20
 SetShellWindow@4
-;SetShellWindowEx
+SetShellWindowEx@8
 SetSysColors@12
 ;SetSysColorsTemp
 SetSystemCursor@8