diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index 2239e9247..a1409175f 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -1602,7 +1602,7 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
 			if (ide->type == IDE_ATAPI)
 				ide->sc->status = DRDY_STAT;
 			else
-				ide->atastat = BSY_STAT;
+				ide->atastat = READY_STAT | BSY_STAT;
 
 			if (ide->type == IDE_ATAPI)
 				ide->sc->callback = 100.0 * IDE_TIME;
diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index 9ce65411f..150dae8ed 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -26,6 +26,8 @@
 #include <QTranslator>
 #include <QDirIterator>
 #include <QLibraryInfo>
+#include <QString>
+#include <QFont>
 
 #ifdef QT_STATIC
 /* Static builds need plugin imports */
@@ -139,6 +141,11 @@ int main(int argc, char* argv[]) {
 #endif
     QApplication app(argc, argv);
     QLocale::setDefault(QLocale::C);
+#ifdef Q_OS_WINDOWS
+    auto font_name = QObject::tr("FONT_NAME");
+    auto font_size = QObject::tr("FONT_SIZE");
+    QApplication::setFont(QFont(font_name, font_size.toInt()));
+#endif
     qt_set_sequence_auto_mnemonic(false);
     Q_INIT_RESOURCE(qt_resources);
     Q_INIT_RESOURCE(qt_translations);
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index be5ab760d..a1616200b 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1012,21 +1012,29 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	case WM_SHUTDOWN:
 		if (manager_wm)
 			break;
-		win_notify_dlg_open();
-		if (confirm_exit && confirm_exit_cmdl)
-			i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
-		else
-			i = 0;
-		if ((i % 10) == 0) {
-			if (i == 10) {
-				confirm_exit = 0;
-				nvr_save();
-				config_save();
-			}
+		if (LOWORD(wParam) == 1) {
+			confirm_exit = 0;
+			nvr_save();
+			config_save();
 			KillTimer(hwnd, TIMER_1SEC);
 			PostQuitMessage(0);
+		} else {
+			win_notify_dlg_open();
+			if (confirm_exit && confirm_exit_cmdl)
+				i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
+			else
+				i = 0;
+			if ((i % 10) == 0) {
+				if (i == 10) {
+					confirm_exit = 0;
+					nvr_save();
+					config_save();
+				}
+				KillTimer(hwnd, TIMER_1SEC);
+				PostQuitMessage(0);
+			}
+			win_notify_dlg_closed();
 		}
-		win_notify_dlg_closed();
 		break;
 
 	case WM_CTRLALTDEL: