diff --git a/src/libui_sdl/libui/windows/text.cpp b/src/libui_sdl/libui/windows/text.cpp
index af79fb80..a52af103 100644
--- a/src/libui_sdl/libui/windows/text.cpp
+++ b/src/libui_sdl/libui/windows/text.cpp
@@ -29,8 +29,7 @@ WCHAR *windowText(HWND hwnd)
 
 void setWindowText(HWND hwnd, WCHAR *wtext)
 {
-	if (SetWindowTextW(hwnd, wtext) == 0)
-		logLastError(L"error setting window text");
+	SetWindowTextW(hwnd, wtext);
 }
 
 void uiFreeText(char *text)
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index 61742b57..814d92c8 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -755,6 +755,12 @@ void TryLoadROM(char* file, int prevstatus)
 
 int OnCloseWindow(uiWindow* window, void* blarg)
 {
+    if (RunningSomething)
+    {
+        EmuRunning = 2;
+        while (EmuStatus != 2);
+    }
+
     uiQuit();
     return 1;
 }