diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp
index 03f7f6a2b76..639b9700350 100644
--- a/base/shell/explorer/taskswnd.cpp
+++ b/base/shell/explorer/taskswnd.cpp
@@ -1258,7 +1258,7 @@ public:
             else
             {
                 WCHAR ExePath[MAX_PATH] = {0};
-                GetProcessPath(dwProcessId, ExePath, _countof(ExePath));
+                GetProcessPath(TaskGroup->dwProcessId, ExePath, _countof(ExePath));
 
                 if(!lstrcmpW(ExePath, ItemExePath))
                 {
@@ -2297,9 +2297,9 @@ public:
             PTASK_GROUP TaskGroup = FindTaskGroupByIndex(TaskGroupOpened);
 
             PTASK_ITEM TaskItem, LastTaskItem = NULL;
-            LastTaskItem = TaskItem + m_TaskItemCount;
 
             TaskItem = m_TaskItems;
+            LastTaskItem = TaskItem + m_TaskItemCount;
 
             while (TaskItem != LastTaskItem)
             {