diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 45c7fe3..ac11773 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -2438,10 +2438,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 
   TRACE("%d\n", dwFlags);
 
-  EnableWindow(hwndBack, FALSE);
-  EnableWindow(hwndNext, FALSE);
-  EnableWindow(hwndFinish, FALSE);
-
   /* set the default pushbutton to an enabled button */
   if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH))
     SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
@@ -2455,9 +2451,13 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 
   if (dwFlags & PSWIZB_BACK)
     EnableWindow(hwndBack, TRUE);
+  else
+    EnableWindow(hwndBack, FALSE);
 
   if (dwFlags & PSWIZB_NEXT)
     EnableWindow(hwndNext, TRUE);
+  else
+    EnableWindow(hwndNext, FALSE);
 
   if (!psInfo->hasFinish)
   {
@@ -2471,6 +2471,8 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 
       if (!(dwFlags & PSWIZB_DISABLEDFINISH))
         EnableWindow(hwndFinish, TRUE);
+      else
+        EnableWindow(hwndFinish, FALSE);
     }
     else
     {
@@ -2482,6 +2484,8 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
   }
   else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
     EnableWindow(hwndFinish, TRUE);
+  else
+    EnableWindow(hwndFinish, FALSE);
 }
 
 /******************************************************************************