diff --git a/src/main/java/edu/kit/typicalc/view/main/HelpDialog.java b/src/main/java/edu/kit/typicalc/view/main/HelpDialog.java
index 7e7e90f..e66481a 100644
--- a/src/main/java/edu/kit/typicalc/view/main/HelpDialog.java
+++ b/src/main/java/edu/kit/typicalc/view/main/HelpDialog.java
@@ -51,7 +51,7 @@ public class HelpDialog extends Dialog implements LocaleChangeObserver {
         languageSelect = new Select<>(Locale.GERMAN, Locale.ENGLISH);
         languageSelect.setTextRenderer(renderer);
         languageSelect.setValue(UI.getCurrent().getLocale());
-        languageSelect.addValueChangeListener(event -> UI.getCurrent().setLocale(event.getValue()));
+        languageSelect.addValueChangeListener(event -> UI.getCurrent().getSession().setLocale(event.getValue()));
         languageSelect.setId(LANGUAGE_SELECT_ID);
         headingLayout.add(heading, languageSelect);
 
diff --git a/src/test/java/edu/kit/typicalc/view/ScreenshotIT.java b/src/test/java/edu/kit/typicalc/view/ScreenshotIT.java
index 00309b3..588e5b3 100644
--- a/src/test/java/edu/kit/typicalc/view/ScreenshotIT.java
+++ b/src/test/java/edu/kit/typicalc/view/ScreenshotIT.java
@@ -223,6 +223,7 @@ public class ScreenshotIT extends AbstractIT {
         executor.waitForVaadin();
         assertTrue(testBench().compareScreen("testScenario1_step3"));
         controlPanelElement.previousStep();
+        executor.waitForVaadin();
         assertTrue(testBench().compareScreen("testScenario1_step2"));
         controlPanelElement.firstStep();
         executor.waitForVaadin();