diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp
index 471973516ee4d1657b79b27c35fdb89252c27c71..b99e986b0cde7fb9321cdf3f3d0b41ef8ef36dcb 100644
--- a/dll/win32/shell32/shlfolder.cpp
+++ b/dll/win32/shell32/shlfolder.cpp
@@ -468,7 +468,7 @@ Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj)
     hr = psf->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strFile);
     if (SUCCEEDED(hr))
     {
-        hr = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, apidl);
+        hr = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, apidl) ? S_OK : E_FAIL;
         if (FAILED(hr))
             ERR("SH_ShowPropertiesDialog failed\n");
     }
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index ce7292f396460a139c056d3eab97e39fce4b92dd..310450d1a32042e74042def09390953effa2c604 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);