diff --git a/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java b/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
index 913ce5f..f3f5736 100644
--- a/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
+++ b/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
@@ -365,9 +365,13 @@ public boolean touchUp(int screenX, int screenY, int pointer, int button) {
         if (fullScreenClicked) {
             Boolean fullScreen = Gdx.graphics.isFullscreen();
             if (fullScreen == true) {
+                if (screenWidthBeforeFullScreen > screenHeightBeforeFullScreen) {
+                    keyboardType = KeyboardType.OFF;
+                }
                 Gdx.graphics.setWindowedMode(screenWidthBeforeFullScreen, screenHeightBeforeFullScreen);
             }
             else {
+                keyboardType = KeyboardType.OFF;
                 Graphics.DisplayMode currentMode = Gdx.graphics.getDisplayMode();
                 screenWidthBeforeFullScreen = Gdx.graphics.getWidth();
                 screenHeightBeforeFullScreen = Gdx.graphics.getHeight();