diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc
index 43b3e4fde..30f31bd24 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.rc
+++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc
@@ -626,7 +626,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    GROUPBOX        "Basic Information",IDC_STATIC,7,7,246,67
+    GROUPBOX        "Basic Information",IDC_BASICINFORMATION,7,7,246,67
     LTEXT           "Name:",IDC_STATIC,14,19,22,8
     EDITTEXT        IDC_NAME,40,19,206,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
     LTEXT           "Type:",IDC_STATIC,14,32,20,8
diff --git a/2.x/trunk/ProcessHacker/hndlprp.c b/2.x/trunk/ProcessHacker/hndlprp.c
index 921eedca0..4d3185b1d 100644
--- a/2.x/trunk/ProcessHacker/hndlprp.c
+++ b/2.x/trunk/ProcessHacker/hndlprp.c
@@ -507,6 +507,20 @@ INT_PTR CALLBACK PhpHandleGeneralDlgProc(
             }
         }
         break;
+    case WM_NOTIFY:
+        {
+            LPNMHDR header = (LPNMHDR)lParam;
+
+            switch (header->code)
+            {
+            case PSN_QUERYINITIALFOCUS:
+                {
+					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)GetDlgItem(hwndDlg, IDC_BASICINFORMATION));
+                }
+                return TRUE;
+			}
+		}
+		break;
     }
 
     return FALSE;
diff --git a/2.x/trunk/ProcessHacker/resource.h b/2.x/trunk/ProcessHacker/resource.h
index d0d7a9380..a136823c8 100644
--- a/2.x/trunk/ProcessHacker/resource.h
+++ b/2.x/trunk/ProcessHacker/resource.h
@@ -439,6 +439,7 @@
 #define IDC_ENABLECYCLECPUUSAGE         1293
 #define IDC_IDEALPROCESSOR              1294
 #define IDC_STATICBL12                  1295
+#define IDC_BASICINFORMATION            1296
 #define ID_MAINWND_PROCESSTL            2001
 #define ID_MAINWND_SERVICETL            2002
 #define ID_MAINWND_NETWORKTL            2003
@@ -669,7 +670,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        196
 #define _APS_NEXT_COMMAND_VALUE         40252
-#define _APS_NEXT_CONTROL_VALUE         1296
+#define _APS_NEXT_CONTROL_VALUE         1297
 #define _APS_NEXT_SYMED_VALUE           133
 #endif
 #endif
diff --git a/2.x/trunk/tools/peview/peprp.c b/2.x/trunk/tools/peview/peprp.c
index 1d9af59cc..9a32cc2e6 100644
--- a/2.x/trunk/tools/peview/peprp.c
+++ b/2.x/trunk/tools/peview/peprp.c
@@ -764,6 +764,7 @@ INT_PTR CALLBACK PvpPeClrDlgProc(
                 return TRUE;
 			}
 		}
+		break;
     }
 
     return FALSE;