diff --git a/2.x/trunk/CHANGELOG.txt b/2.x/trunk/CHANGELOG.txt
index 26e63e2b3..e7284b1b0 100644
--- a/2.x/trunk/CHANGELOG.txt
+++ b/2.x/trunk/CHANGELOG.txt
@@ -1,5 +1,10 @@
 Process Hacker
 
+2.14
+ * NEW/IMPROVED:
+ * FIXED:
+   * Icon should restore the main window if it is minimized
+
 2.13
  * NEW/IMPROVED:
    * Added copy support to PE viewer
diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc
index 3ccd1445d..faee0bb05 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.rc
+++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc
@@ -451,8 +451,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,13,0,0
- PRODUCTVERSION 2,13,0,0
+ FILEVERSION 2,14,0,0
+ PRODUCTVERSION 2,14,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -469,12 +469,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "wj32"
             VALUE "FileDescription", "Process Hacker"
-            VALUE "FileVersion", "2.13"
+            VALUE "FileVersion", "2.14"
             VALUE "InternalName", "Process Hacker"
             VALUE "LegalCopyright", "Licensed under the GNU GPL, v3."
             VALUE "OriginalFilename", "ProcessHacker.exe"
             VALUE "ProductName", "Process Hacker"
-            VALUE "ProductVersion", "2.13"
+            VALUE "ProductVersion", "2.14"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/2.x/trunk/ProcessHacker/mainwnd.c b/2.x/trunk/ProcessHacker/mainwnd.c
index 625aa3017..1bc2b4ee9 100644
--- a/2.x/trunk/ProcessHacker/mainwnd.c
+++ b/2.x/trunk/ProcessHacker/mainwnd.c
@@ -1810,7 +1810,12 @@ LRESULT CALLBACK PhMainWndProc(
         break;
     case WM_PH_TOGGLE_VISIBLE:
         {
-            if (IsWindowVisible(PhMainWndHandle))
+            if (IsIconic(PhMainWndHandle))
+            {
+                ShowWindow(PhMainWndHandle, SW_RESTORE);
+                SetForegroundWindow(PhMainWndHandle);
+            }
+            else if (IsWindowVisible(PhMainWndHandle))
             {
                 ShowWindow(PhMainWndHandle, SW_HIDE);
             }