diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c
index 37f42617f5e..2a646ef9192 100644
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -466,6 +466,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                     fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path);
                     SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath);
                     HeapFree(GetProcessHeap(), 0, fullPath);
+                    update_listview_path(path);
                     HeapFree(GetProcessHeap(), 0, path);
 		}
                 SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0);
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index dc3152d3e39..9e271ad3915 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -91,6 +91,17 @@ LPCWSTR GetValueName(HWND hwndLV)
     return g_valueName;
 }
 
+BOOL update_listview_path(const WCHAR *path)
+{
+    HeapFree(GetProcessHeap(), 0, g_currentPath);
+
+    g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR));
+    if (!g_currentPath) return FALSE;
+    lstrcpyW(g_currentPath, path);
+
+    return TRUE;
+}
+
 /* convert '\0' separated string list into ',' separated string list */
 static void MakeMULTISZDisplayable(LPWSTR multi)
 {
@@ -557,12 +568,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli
     SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc);
 
     g_currentRootKey = hKeyRoot;
-    if (keyPath != g_currentPath) {
-	HeapFree(GetProcessHeap(), 0, g_currentPath);
-	g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath) + 1) * sizeof(WCHAR));
-	if (!g_currentPath) goto done;
-	lstrcpyW(g_currentPath, keyPath);
-    }
+    if (keyPath != g_currentPath && !update_listview_path(keyPath))
+        goto done;
 
     result = TRUE;
 
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 533118983af..f3fbf86de48 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -117,6 +117,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize);
 extern void UpdateStatusBar(void);
 
 /* listview.c */
+extern BOOL update_listview_path(const WCHAR *path);
 extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size);
 extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos);
 extern HWND CreateListView(HWND hwndParent, UINT id);