diff --git a/dll/cpl/console/options.c b/dll/cpl/console/options.c
index c2089592c9a..9ba28cfcdfd 100644
--- a/dll/cpl/console/options.c
+++ b/dll/cpl/console/options.c
@@ -105,48 +105,48 @@ OptionsProc(HWND hwndDlg,
                 }
                 case IDC_CHECK_QUICK_EDIT:
                 {
-                    lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0);
+                    lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
                     if (lResult == BST_CHECKED)
                     {
                         pConInfo->ci.QuickEdit = FALSE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
                     }
                     else if (lResult == BST_UNCHECKED)
                     {
                         pConInfo->ci.QuickEdit = TRUE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
                     }
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
                 }
                 case IDC_CHECK_INSERT_MODE:
                 {
-                    lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0);
+                    lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
                     if (lResult == BST_CHECKED)
                     {
                         pConInfo->ci.InsertMode = FALSE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
                     }
                     else if (lResult == BST_UNCHECKED)
                     {
                         pConInfo->ci.InsertMode = TRUE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
                     }
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
                 }
                 case IDC_CHECK_DISCARD_DUPLICATES:
                 {
-                   lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0);
+                   lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
                     if (lResult == BST_CHECKED)
                     {
                         pConInfo->ci.HistoryNoDup = FALSE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
                     }
                     else if (lResult == BST_UNCHECKED)
                     {
                         pConInfo->ci.HistoryNoDup = TRUE;
-                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
+                        SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
                     }
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
diff --git a/win32ss/user/consrv/frontends/gui/guiterm.c b/win32ss/user/consrv/frontends/gui/guiterm.c
index 74e2520df5a..9d2ae4da92a 100644
--- a/win32ss/user/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/consrv/frontends/gui/guiterm.c
@@ -1529,6 +1529,7 @@ GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
             }
         }
 
+        case WM_COMMAND:
         case WM_SYSCOMMAND:
         {
             Result = GuiConsoleHandleSysMenuCommand(GuiData, wParam, lParam);
diff --git a/win32ss/user/consrv/settings.c b/win32ss/user/consrv/settings.c
index 4b1d95abc77..3fcf396833a 100644
--- a/win32ss/user/consrv/settings.c
+++ b/win32ss/user/consrv/settings.c
@@ -450,6 +450,23 @@ ConSrvApplyUserSettings(IN PCONSOLE Console,
     COORD BufSize;
     BOOL SizeChanged = FALSE;
 
+    /*
+     * Apply full-screen mode.
+     */
+    if (ConsoleInfo->FullScreen)
+        Console->ActiveBuffer->DisplayMode |= CONSOLE_FULLSCREEN_MODE;
+    else
+        Console->ActiveBuffer->DisplayMode &= ~CONSOLE_FULLSCREEN_MODE;
+    // TODO: Apply it really
+
+    /*
+     * Apply terminal-edition settings:
+     * - QuickEdit and Insert modes,
+     * - history settings.
+     */
+    Console->QuickEdit  = ConsoleInfo->QuickEdit;
+    Console->InsertMode = ConsoleInfo->InsertMode;
+
     /*
      * Apply foreground and background colors for both screen and popup
      * and copy the new palette.