diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp
index d293edb73e8..cb4d167f817 100644
--- a/dll/shellext/netshell/shfldr_netconnect.cpp
+++ b/dll/shellext/netshell/shfldr_netconnect.cpp
@@ -534,6 +534,7 @@ HRESULT WINAPI CNetworkConnections::SetNameOf (
                LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD * pPidlOut)
 {
     const VALUEStruct * val;
+    HRESULT hr;
 
     val = _ILGetValueStruct(pidl);
     if (!val)
@@ -542,7 +543,14 @@ HRESULT WINAPI CNetworkConnections::SetNameOf (
    if (!val->pItem)
        return E_FAIL;
 
-    return val->pItem->Rename(lpName);
+    hr = val->pItem->Rename(lpName);
+    if (FAILED(hr))
+        return hr;
+
+    /* The pidl hasn't changed */
+    *pPidlOut = ILClone(pidl);
+
+    return S_OK;
 }
 
 HRESULT WINAPI CNetworkConnections::GetDefaultSearchGUID(GUID * pguid)