diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 7e1c7d565c49071ecd51e288dd26b1b0426fd3d6..1a22150d861cb4fa0f5887c150e1895bf7d1c8de 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -964,15 +964,6 @@ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv)
     return E_NOTIMPL;
 }
 
-/*************************************************************************
- * SHGetPropertyStoreFromParsingName [SHELL32.@]
- */
-HRESULT WINAPI SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv)
-{
-    FIXME("(%s %p %u %p %p) stub!\n", debugstr_w(pszPath), pbc, flags, riid, ppv);
-    return E_NOTIMPL;
-}
-
 /*************************************************************************/
 
 typedef struct
diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c
index 57f5fa6b6ad97b332d1777d4da31b552e6e52462..1e19f7c72e9bbebf714b87d0632374a53e66f50f 100644
--- a/dlls/shell32/shellitem.c
+++ b/dlls/shell32/shellitem.c
@@ -1331,6 +1331,24 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl,
     return ret;
 }
 
+HRESULT WINAPI SHGetPropertyStoreFromParsingName(const WCHAR *path, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags,
+    REFIID riid, void **ppv)
+{
+    IShellItem2 *item;
+    HRESULT hr;
+
+    TRACE("(%s %p %#x %p %p)\n", debugstr_w(path), pbc, flags, riid, ppv);
+
+    hr = SHCreateItemFromParsingName(path, pbc, &IID_IShellItem2, (void **)&item);
+    if(SUCCEEDED(hr))
+    {
+        hr = IShellItem2_GetPropertyStore(item, flags, riid, ppv);
+        IShellItem2_Release(item);
+    }
+
+    return hr;
+}
+
 static HRESULT WINAPI CustomDestinationList_QueryInterface(ICustomDestinationList *iface, REFIID riid, void **obj)
 {
     CustomDestinationList *This = impl_from_ICustomDestinationList(iface);