diff --git a/checkin_notes b/checkin_notes
index 4de6b2d886..6d05927824 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5885,6 +5885,9 @@ Rom    29 April 2005
     - Bug Fix: UpdateSelection should be called everytime the listview has
         been refreshed in case a project/result/transfer has changed its
         status which might cause a button change.
+    - Bug Fix: Double clicking on the taskbar icon will restore the window
+        as well as show it.
 
     clientgui/
         BOINCBaseView.cpp
+        BOINCTaskBar.cpp
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 708bd4d351..4135157f51 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -116,6 +116,11 @@ void CTaskBarIcon::OnOpen(wxCommandEvent& WXUNUSED(event)) {
 
     if (pFrame) {
         pFrame->Show();
+        if (pFrame->IsMaximized()) {
+            pFrame->Maximize(true);
+        } else {
+            pFrame->Maximize(false);
+        }
         pFrame->SendSizeEvent();
 
 #ifdef __WXMSW__