diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
index 24f99b4cb..86d0de0d9 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
@@ -145,8 +145,8 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
 	}
 	
 	@Override
-	public void onResume() {
-		super.onResume();
+	public void onStart() {
+		super.onStart();
 		
 		now = 0;
 		view.onResume();
@@ -156,8 +156,8 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
 	}
 	
 	@Override
-	public void onPause() {
-		super.onPause();
+	public void onStop() {
+		super.onStop();
 		
 		if (scene != null) {
 			scene.pause();
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index da0168cc5..c5d2a2449 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
 	<uses-sdk
 		android:minSdkVersion="8"
-		android:targetSdkVersion="25"/>
+		android:targetSdkVersion="26"/>
 	
 	<uses-feature
 		android:glEsVersion="0x00020000"/>
@@ -25,12 +25,12 @@
 	<application
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
-		android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+		android:theme="@android:style/Theme.Black.NoTitleBar"
 		android:allowBackup="false">
 		<activity
 			android:label="@string/app_name"
 			android:name=".ShatteredPixelDungeon"
-			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
 			android:screenOrientation="nosensor">
 			<intent-filter >
 				<action android:name="android.intent.action.MAIN" />
@@ -39,4 +39,4 @@
 		</activity>
 	</application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
index d372a469f..9d76ff58d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
@@ -27,6 +27,7 @@ import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@@ -93,7 +94,7 @@ public class ShatteredPixelDungeon extends Game {
 	protected void onCreate( Bundle savedInstanceState ) {
 		super.onCreate(savedInstanceState);
 
-		updateImmersiveMode();
+		updateSystemUI();
 		
 		if (Preferences.INSTANCE.contains( Preferences.KEY_LANDSCAPE )){
 			landscape ( Preferences.INSTANCE.getBoolean( Preferences.KEY_LANDSCAPE, false));
@@ -172,12 +173,14 @@ public class ShatteredPixelDungeon extends Game {
 
 	@Override
 	public void onWindowFocusChanged( boolean hasFocus ) {
-
 		super.onWindowFocusChanged( hasFocus );
+		if (hasFocus) updateSystemUI();
+	}
 
-		if (hasFocus) {
-			updateImmersiveMode();
-		}
+	@Override
+	public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
+		super.onMultiWindowModeChanged(isInMultiWindowMode);
+		updateSystemUI();
 	}
 
 	public static void switchNoFade(Class<? extends PixelScene> c){
@@ -223,8 +226,7 @@ public class ShatteredPixelDungeon extends Game {
 		instance.runOnUiThread( new Runnable() {
 			@Override
 			public void run() {
-				updateImmersiveMode();
-				immersiveModeChanged = true;
+				updateSystemUI();
 				//ensures surfacechanged is called if the view was previously set to be fixed.
 				((ShatteredPixelDungeon)instance).view.getHolder().setSizeFromLayout();
 			}
@@ -238,10 +240,6 @@ public class ShatteredPixelDungeon extends Game {
 
 		updateDisplaySize();
 
-		if (immersiveModeChanged) {
-			requestedReset = true;
-			immersiveModeChanged = false;
-		}
 	}
 
 	private void updateDisplaySize(){
@@ -295,24 +293,32 @@ public class ShatteredPixelDungeon extends Game {
 		}
 	}
 
-	public static void updateImmersiveMode() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-			try {
-				// Sometime NullPointerException happens here
+	public static void updateSystemUI() {
+
+		boolean fullscreen = Build.VERSION.SDK_INT < Build.VERSION_CODES.N
+								|| !instance.isInMultiWindowMode();
+
+		if (fullscreen){
+			instance.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN | WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+		} else {
+			instance.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN | WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+		}
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){
+			if (fullscreen && immersed()) {
 				instance.getWindow().getDecorView().setSystemUiVisibility(
-						immersed() ?
-								View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-										View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-										View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-										View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-										View.SYSTEM_UI_FLAG_FULLSCREEN |
-										View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-								:
-								0 );
-			} catch (Exception e) {
-				reportException( e );
+						View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+						View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+						View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+						View.SYSTEM_UI_FLAG_HIDE_NAVIGATION );
+			} else {
+				instance.getWindow().getDecorView().setSystemUiVisibility(
+						View.SYSTEM_UI_FLAG_LAYOUT_STABLE );
 			}
 		}
+
 	}
 
 	public static boolean immersed() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTextInput.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTextInput.java
index 91fa2a720..04b74edff 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTextInput.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTextInput.java
@@ -204,7 +204,7 @@ public class WndTextInput extends Window {
 					imm.hideSoftInputFromWindow(textInput.getWindowToken(), 0);
 
 					//Soft keyboard sometimes triggers software buttons, so make sure to reassert immersive
-					ShatteredPixelDungeon.updateImmersiveMode();
+					ShatteredPixelDungeon.updateSystemUI();
 
 					textInput = null;
 				}