diff --git a/reactos/dll/win32/shell32/recyclebin.c b/reactos/dll/win32/shell32/recyclebin.c
index 477220b56af..9fd4e21debb 100644
--- a/reactos/dll/win32/shell32/recyclebin.c
+++ b/reactos/dll/win32/shell32/recyclebin.c
@@ -726,7 +726,15 @@ RecycleBin_IContextMenu_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINF
 
     TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb);
 
-    if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties))
+    if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdEmpty))
+    {
+        // FIXME
+        // path & flags
+        return SHEmptyRecycleBinW(lpici->hwnd, L"C:\\", 0);
+    }
+
+
+    if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdProperties))
     {
        WCHAR szDrive = 'C';
        SH_ShowRecycleBinProperties(szDrive);
diff --git a/reactos/dll/win32/shell32/shv_item_cmenu.c b/reactos/dll/win32/shell32/shv_item_cmenu.c
index 34980385db2..be9db69a6d8 100644
--- a/reactos/dll/win32/shell32/shv_item_cmenu.c
+++ b/reactos/dll/win32/shell32/shv_item_cmenu.c
@@ -361,6 +361,7 @@ SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu
     }
 
     curEntry = This->dhead;
+    This->iIdSHEFirst = idCmdFirst;
     do
     {