diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index 9792e0568f..5afbbff396 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -82,6 +82,10 @@ HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf,
         if (!SH_ShowRecycleBinProperties(L'C'))
             hr = E_FAIL;
     }
+    else
+    {
+        hr = Shell_DefaultContextMenuCallBack(psf, pdtobj);
+    }
 
     SHFree(pidlFolder);
     _ILFreeaPidl(apidl, cidl);
diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp
index ee6c78b47f..8579a48ac2 100644
--- a/dll/win32/shell32/shlfolder.cpp
+++ b/dll/win32/shell32/shlfolder.cpp
@@ -450,7 +450,10 @@ _ShowPropertiesDialogThread(LPVOID lpParameter)
 
     BOOL bSuccess = SH_ShowPropertiesDialog(wszName, pDataObject);
     if (!bSuccess)
+    {
         ERR("SH_ShowPropertiesDialog failed\n");
+        return E_FAIL;
+    }
 
     return 0;
 }