diff --git a/src/core/libraries/system/msgdialog_ui.cpp b/src/core/libraries/system/msgdialog_ui.cpp
index d69754fe..63b3390c 100644
--- a/src/core/libraries/system/msgdialog_ui.cpp
+++ b/src/core/libraries/system/msgdialog_ui.cpp
@@ -253,8 +253,7 @@ void MsgDialogUi::Draw() {
     SetNextWindowCollapsed(false);
     KeepNavHighlight();
     // Hack to allow every dialog to have a unique window
-    if (Begin("Message Dialog##MessageDialog", nullptr,
-              ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoSavedSettings)) {
+    if (Begin("Message Dialog##MessageDialog", nullptr, ImGuiWindowFlags_NoSavedSettings)) {
         switch (state->GetMode()) {
         case MsgDialogMode::USER_MSG:
             DrawUser();
@@ -266,8 +265,8 @@ void MsgDialogUi::Draw() {
             DrawSystemMessage();
             break;
         }
-        End();
     }
+    End();
 
     first_render = false;
 }
\ No newline at end of file
diff --git a/src/imgui/layer/video_info.cpp b/src/imgui/layer/video_info.cpp
index 15226cd8..2a60926f 100644
--- a/src/imgui/layer/video_info.cpp
+++ b/src/imgui/layer/video_info.cpp
@@ -9,8 +9,10 @@ void ImGui::Layers::VideoInfo::Draw() {
 
     m_show = IsKeyPressed(ImGuiKey_F10, false) ^ m_show;
 
-    if (m_show && Begin("Video Info")) {
-        Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
+    if (m_show) {
+        if (Begin("Video Info")) {
+            Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
+        }
         End();
     }
 }