diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc
index cbbea2b67..dd7c91c85 100644
--- a/src/WIN/86Box.rc
+++ b/src/WIN/86Box.rc
@@ -195,7 +195,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,246,220,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,307,220,50,14
     CONTROL         "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_LIST | 
-                    LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,90,197
+                    LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,90,197
     CONTROL         "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,211,363,1
     LTEXT           "Language:",2047,7,222,41,10
     COMBOBOX        IDC_COMBO_LANG,48,221,108,120,CBS_DROPDOWN | WS_VSCROLL | 
@@ -401,7 +401,8 @@ STYLE DS_CONTROL | WS_CHILD
 FONT 9, "Segoe UI"
 BEGIN
     CONTROL         "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,18,253,92
+                    LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
+                    WS_TABSTOP,7,18,253,92
     LTEXT           "Hard disks:",-1,7,7,34,8
     PUSHBUTTON      "&New...",IDC_BUTTON_HDD_ADD_NEW,60,137,62,10
     PUSHBUTTON      "&Existing...",IDC_BUTTON_HDD_ADD,129,137,62,10
@@ -428,11 +429,12 @@ STYLE DS_CONTROL | WS_CHILD
 FONT 9, "Segoe UI"
 BEGIN
     CONTROL         "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,
-                    7,18,253,60
+                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
+                    WS_TABSTOP,7,18,253,60
     LTEXT           "Floppy drives:",-1,7,7,43,8
     CONTROL         "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,116,253,60
+                    LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
+                    WS_TABSTOP,7,116,253,60
     LTEXT           "CD-ROM drives:",-1,7,106,50,8
     COMBOBOX        IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
diff --git a/src/WIN/win.c b/src/WIN/win.c
index 09d271da5..0be43d165 100644
--- a/src/WIN/win.c
+++ b/src/WIN/win.c
@@ -326,7 +326,7 @@ void mainthread(LPVOID param)
 
 			if (mousecapture)
 			{
-				GetWindowRect(ghwnd, &r);
+				GetWindowRect(hwndRender, &r);
 				ClipCursor(&r);
 			}
 
@@ -2059,7 +2059,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 			if (!mousecapture && !video_fullscreen)
 			{
 				GetClipCursor(&oldclip);
-				GetWindowRect(hwnd, &rect);
+				GetWindowRect(hwndRender, &rect);
 
 				ClipCursor(&rect);
 				mousecapture = 1;
@@ -2101,7 +2101,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 
 			if (mousecapture)
 			{
-				GetWindowRect(hwnd, &rect);
+				GetWindowRect(hwndRender, &rect);
 
 				ClipCursor(&rect);
 			}