diff --git a/reactos/subsys/system/taskmgr/applpage.c b/reactos/subsys/system/taskmgr/applpage.c
index fe53c0ad4ae..1593ffbe603 100644
--- a/reactos/subsys/system/taskmgr/applpage.c
+++ b/reactos/subsys/system/taskmgr/applpage.c
@@ -48,6 +48,7 @@ void            ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam);
 void            ApplicationPageShowContextMenu1(void);
 void            ApplicationPageShowContextMenu2(void);
 int CALLBACK    ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
+int             PerfGetIndexByProcessId(DWORD dwProcessId);
 
 #if 0
 void SwitchToThisWindow (
@@ -936,9 +937,18 @@ void ApplicationPage_OnGotoProcess(void)
          */
         TabCtrl_SetCurFocus(hTabWnd, 1);
         /*
-         * FIXME: Select the process item in the list
+         * Select the process item in the list
          */
-        for (i=0; i<ListView_GetItemCount(hProcessPage); i++) {
+        i = PerfGetIndexByProcessId(dwProcessId);
+        if (i != -1)
+        {
+            ListView_SetItemState(hProcessPageListCtrl,
+                                  i,
+                                  LVIS_SELECTED | LVIS_FOCUSED,
+                                  LVIS_SELECTED | LVIS_FOCUSED);
+            ListView_EnsureVisible(hProcessPageListCtrl,
+                                   i,
+                                   FALSE);
         }
     }
 }
diff --git a/reactos/subsys/system/taskmgr/perfdata.c b/reactos/subsys/system/taskmgr/perfdata.c
index 6555c624665..22aadf68fb0 100644
--- a/reactos/subsys/system/taskmgr/perfdata.c
+++ b/reactos/subsys/system/taskmgr/perfdata.c
@@ -345,6 +345,26 @@ BOOL PerfDataGetImageName(ULONG Index, LPTSTR lpImageName, int nMaxCount)
     return bSuccessful;
 }
 
+int PerfGetIndexByProcessId(DWORD dwProcessId)
+{
+    int Index, FoundIndex = -1;
+
+    EnterCriticalSection(&PerfDataCriticalSection);
+
+    for (Index = 0; Index < ProcessCount; Index++)
+    {
+        if ((DWORD)pPerfData[Index].ProcessId == dwProcessId)
+        {
+            FoundIndex = Index;
+            break;
+        }
+    }
+
+    LeaveCriticalSection(&PerfDataCriticalSection);
+
+    return FoundIndex;
+}
+
 ULONG PerfDataGetProcessId(ULONG Index)
 {
     ULONG    ProcessId;