diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
index 196024fca..26609982b 100644
--- a/app/src/main/java/com/termux/x11/MainActivity.java
+++ b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -41,9 +41,13 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        /*
         if (didRequestLaunchExternalDisplay()) {
             setFullScreenForExternalDisplay();
         }
+        */
+        // Do it anyways
+        setFullScreenForExternalDisplay();
 
         LorieService.setMainActivity(this);
         LorieService.start(LorieService.ACTION_START_FROM_ACTIVITY);
diff --git a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java
index a024e8f20..c028dff3f 100644
--- a/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java
+++ b/app/src/main/java/com/termux/x11/TermuxX11StarterReceiver.java
@@ -68,13 +68,16 @@ private Bundle createLaunchParams(Intent launchIntent) {
     @Nullable
     private Display findExternalDisplay() {
         DisplayManagerCompat displayManager = DisplayManagerCompat.getInstance(this);
+        Display fallbackDisplay = null;
         for (Display display : displayManager.getDisplays()) {
             // id 0 is built-in screen
+            fallbackDisplay = display;
             if (display.getDisplayId() != 0) {
                 return display;
             }
         }
-        return null;
+        //fallback to
+        return fallbackDisplay;
     }
 
     /**
@@ -150,6 +153,8 @@ private void handleIntent(Intent intent) {
 
         try {
             svc.finish();
+            // Finish activities so the app doesnt get bugged after stopping the service
+            finishAffinity();
         } catch (RemoteException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3c3429ae4..69c51508e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,20 +2,16 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-	<item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     <style name="NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-	<item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
 
     <!-- For use w/ external displays to be able to use entire display surface area -->