diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index 32fd753c12c..c99b86ddc13 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -1492,6 +1492,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
         case FCIDM_SHVIEW_CUT:
         case FCIDM_SHVIEW_COPY:
         case FCIDM_SHVIEW_RENAME:
+        case FCIDM_SHVIEW_PROPERTIES:
             return OnExplorerCommand(dwCmdID, TRUE);
         case FCIDM_SHVIEW_INSERT:
         case FCIDM_SHVIEW_UNDO:
diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp
index aeaeea403a6..fc969d1b818 100644
--- a/dll/win32/shell32/CShellLink.cpp
+++ b/dll/win32/shell32/CShellLink.cpp
@@ -144,7 +144,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define SHLINK_LOCAL  0
 #define SHLINK_REMOTE 1
-#define MAX_PROPERTY_SHEET_PAGE 32
 
 /* link file formats */
 
diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp
index 921265d9692..7e3f9b2bbcf 100644
--- a/dll/win32/shell32/dialogs/drive.cpp
+++ b/dll/win32/shell32/dialogs/drive.cpp
@@ -20,8 +20,6 @@
 
 #include "precomp.h"
 
-#define MAX_PROPERTY_SHEET_PAGE 32
-
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct
@@ -108,18 +106,6 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum
     return TRUE;
 }
 
-static BOOL CALLBACK
-AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam)
-{
-    PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam;
-    if (ppsh->nPages < MAX_PROPERTY_SHEET_PAGE)
-    {
-        ppsh->phpage[ppsh->nPages++] = hPage;
-        return TRUE;
-    }
-    return FALSE;
-}
-
 typedef struct _DRIVE_PROP_PAGE
 {
     LPCSTR resname;
diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp
index b224c6a7718..50c93eb86db 100644
--- a/dll/win32/shell32/dialogs/folder_options.cpp
+++ b/dll/win32/shell32/dialogs/folder_options.cpp
@@ -23,8 +23,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL (fprop);
 
-#define MAX_PROPERTY_SHEET_PAGE (32)
-
 /// Folder Options:
 /// CLASSKEY = HKEY_CLASSES_ROOT\CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}
 /// DefaultIcon = %SystemRoot%\system32\SHELL32.dll,-210
diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp
index ede236fa853..0b826b69a58 100644
--- a/dll/win32/shell32/dialogs/fprop.cpp
+++ b/dll/win32/shell32/dialogs/fprop.cpp
@@ -21,26 +21,10 @@
 
 #include "precomp.h"
 
-#define MAX_PROPERTY_SHEET_PAGE 32
-
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj);
 
-static BOOL CALLBACK
-AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam)
-{
-    PROPSHEETHEADERW *pHeader = (PROPSHEETHEADERW *)lParam;
-
-    if (pHeader->nPages < MAX_PROPERTY_SHEET_PAGE)
-    {
-        pHeader->phpage[pHeader->nPages++] = hPage;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
 static UINT
 LoadPropSheetHandlers(LPCWSTR pwszPath, PROPSHEETHEADERW *pHeader, UINT cMaxPages, HPSXA *phpsxa, IDataObject *pDataObj)
 {
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
index 57b9b1436a0..a677262d675 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -803,7 +803,7 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S
                 if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0))
                 {
                     GetDiskFreeSpaceExA(pszDrive, &ulFreeBytes, &ulTotalBytes, NULL);
-                    if (iColumn == 2)
+                    if (iColumn == 3)
                         StrFormatByteSize64A(ulTotalBytes.QuadPart, psd->str.cStr, MAX_PATH);
                     else
                         StrFormatByteSize64A(ulFreeBytes.QuadPart, psd->str.cStr, MAX_PATH);
diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
index 27498a8ceef..538de6c6688 100644
--- a/dll/win32/shell32/folders/CRecycleBin.cpp
+++ b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -24,8 +24,6 @@
 #include <mmsystem.h>
 #include <ntquery.h>
 
-#define MAX_PROPERTY_SHEET_PAGE 32
-
 WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin);
 
 typedef struct
diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h
index a959a4a20ad..33e3cab59fb 100644
--- a/dll/win32/shell32/precomp.h
+++ b/dll/win32/shell32/precomp.h
@@ -98,6 +98,24 @@ extern const GUID CLSID_UnixDosFolder;
 extern const GUID SHELL32_AdvtShortcutProduct;
 extern const GUID SHELL32_AdvtShortcutComponent;
 
+#define MAX_PROPERTY_SHEET_PAGE 32
+
+extern inline
+BOOL
+CALLBACK
+AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam)
+{
+    PROPSHEETHEADERW *pHeader = (PROPSHEETHEADERW *)lParam;
+
+    if (pHeader->nPages < MAX_PROPERTY_SHEET_PAGE)
+    {
+        pHeader->phpage[pHeader->nPages++] = hPage;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 HRESULT WINAPI
 Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj);
 
diff --git a/dll/win32/shell32/res/rgs/shellfsfolder.rgs b/dll/win32/shell32/res/rgs/shellfsfolder.rgs
index ca0ecbcb6c8..27a304abc33 100644
--- a/dll/win32/shell32/res/rgs/shellfsfolder.rgs
+++ b/dll/win32/shell32/res/rgs/shellfsfolder.rgs
@@ -9,16 +9,16 @@ HKCR
 				val ThreadingModel = s 'Apartment'
 			}
 		}
-		NoRemove Interface
+	}
+	NoRemove Interface
+	{
+		ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder'
 		{
-			ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder'
+			NumMethods = s '13'
+			{
+			}
+			ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}'
 			{
-				NumMethods = s '13'
-				{
-				}
-				ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}'
-				{
-				}
 			}
 		}
 	}
diff --git a/dll/win32/shell32/res/rgs/shelllink.rgs b/dll/win32/shell32/res/rgs/shelllink.rgs
index fe4b9db854a..9828c975964 100644
--- a/dll/win32/shell32/res/rgs/shelllink.rgs
+++ b/dll/win32/shell32/res/rgs/shelllink.rgs
@@ -19,25 +19,25 @@ HKCR
 				MayChangeDefaultMenu = s ''
 			}
 		}
-		NoRemove Interface
+	}
+	NoRemove Interface
+	{
+		ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA'
 		{
-			ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA'
+			NumMethods = s '21'
 			{
-				NumMethods = s '21'
-				{
-				}
-				ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
-				{
-				}
 			}
-			ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW'
+			ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+			{
+			}
+		}
+		ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW'
+		{
+			NumMethods = s '21'
+			{
+			}
+			ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
 			{
-				NumMethods = s '21'
-				{
-				}
-				ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
-				{
-				}
 			}
 		}
 	}
diff --git a/dll/win32/shell32/shell32.rc b/dll/win32/shell32/shell32.rc
index 4d5fdec205f..243a1d1d942 100644
--- a/dll/win32/shell32/shell32.rc
+++ b/dll/win32/shell32/shell32.rc
@@ -34,7 +34,7 @@ BEGIN
     VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY
     VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY, SHIFT
     VK_F2, FCIDM_SHVIEW_RENAME, VIRTKEY
-    VK_RETURN, FCIDM_SHVIEW_OPEN, VIRTKEY, ALT
+    VK_RETURN, FCIDM_SHVIEW_PROPERTIES, VIRTKEY, ALT
     "X", FCIDM_SHVIEW_CUT, VIRTKEY, CONTROL
     "C", FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL
     VK_INSERT, FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index c7254e6c8bf..6d2504a2825 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -105,8 +105,7 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         case NM_TOOLTIPSCREATED:
             break;
 
-            // Unknown
-        case -714: return S_FALSE;
+        case TBN_DRAGOUT: return S_FALSE;
 
         default:
             TRACE("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom);