diff --git a/game/script.rpy b/game/script.rpy
index f2aae31..6129534 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -60,9 +60,8 @@ label before_main_menu:
     # Call initial language setup screen
     if (persistent.languaged_up is None):
         $ preferences.set_volume('ui', config.default_sfx_volume)
-        $ persistent.languaged_up = True
         call screen lang_sel
-
+        $ persistent.languaged_up = True
     return
 
 label start:
diff --git a/game/src/translation.rpy b/game/src/translation.rpy
index 2cca593..61ff7ba 100644
--- a/game/src/translation.rpy
+++ b/game/src/translation.rpy
@@ -25,9 +25,37 @@ screen OkPrompt(message, go_menu):
                 xalign 0.5
                 spacing 100
 
-                textbutton _("OK") activate_sound "audio/ui/uiClick.wav" action If(go_menu, true=MainMenu(False,False), false=Hide())
+                textbutton _("OK") activate_sound "audio/ui/snd_ui_click.wav" action If(go_menu, true=MainMenu(False,False), false=[Hide(),Return()])
+
+screen hiddenOkPrompt(message, go_menu):
+
+    modal True
+
+    zorder 200
+
+    style_prefix "confirm"
+
+    add "gui/overlay/confirm.png"
+
+    frame:
+
+        vbox:
+            xalign .5
+            yalign .5
+            spacing 30
+
+            label _(message):
+                style "confirm_prompt"
+                xalign 0.5
+
+            hbox:
+                xalign 0.5
+                spacing 100
+
+                textbutton _("OK") activate_sound "audio/ui/snd_ui_click.wav" action If(go_menu, true=MainMenu(False,False), false=Hide())
 
 default persistent.seenWarning = []
+default persistent.languaged_up = None
 
 init python:
 
@@ -107,9 +135,9 @@ screen lang_sel():
                                     idle darkie(languages[i]["image"])
                                     hover glowie(languages[i]["image"])
                                     action If(languages[i]["value"] in persistent.seenWarning or languages[i]["value"] == 'en',
-                                        true = [Language(languages[i]["value"]), MainMenu(False,False)],
+                                        true = [Language(languages[i]["value"]), Return()],
                                         # Important to change the language before calling notice. Otherwise it will be in english.
-                                        false = [Language(languages[i]["value"]), AddToSet(set=persistent.seenWarning, value=languages[i]["value"]), Show(screen="OkPrompt", message=notice, go_menu=True)]
+                                        false = [Language(languages[i]["value"]), AddToSet(set=persistent.seenWarning, value=languages[i]["value"]), Show(screen="OkPrompt", message=notice, go_menu=False)]
                                         )
                                     at renpysdumb # Scales the imagebutton down. No, you can't just specify the zoom here. It has to be a defined transform.
                             else:
@@ -124,7 +152,7 @@ screen lang_button(lang):
             activate_sound "audio/ui/uiRollover.wav"
             action If(lang["value"] in persistent.seenWarning or lang["value"] == 'en',
             true = [Language(lang["value"])],
-            false = [Language(lang["value"]), AddToSet(set=persistent.seenWarning, value=lang["value"]), Show(screen="OkPrompt", message=notice, go_menu=False)]
+            false = [Language(lang["value"]), AddToSet(set=persistent.seenWarning, value=lang["value"]), Show(screen="hiddenOkPrompt", message=notice, go_menu=False)]
             )
         if _preferences.language == lang["value"]:
             add glowie(lang["image"]) at icon