diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
index afa4477bf..ce17fbea3 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -311,8 +311,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
+        //Try to get the notch so it can be taken into account in settings
         if (Build.VERSION.SDK_INT >= P){
-            //Get the fucking notch height:
             try {
                 PREF_NOTCH_SIZE = getWindow().getDecorView().getRootWindowInsets().getDisplayCutout().getBoundingRects().get(0).width();
             }catch (Exception e){
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
index 7814bd2dd..723b8cc9c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
@@ -9,6 +9,8 @@ import net.kdt.pojavlaunch.Tools;
 
 import android.content.*;
 
+import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE;
+
 public class LauncherPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener
 {
     @Override
@@ -16,9 +18,9 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat impleme
         addPreferencesFromResource(R.xml.pref_main);
 		
         // Disable freeform mode in Android 6.0 and below.
-        findPreference("freeform").setVisible(Build.VERSION.SDK_INT >= 24);
+        findPreference("freeform").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N);
         //Disable notch checking behavior on android 8.1 and below.
-        findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= 28);
+        findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && PREF_NOTCH_SIZE != 0);
 		
         CustomSeekBarPreference seek2 = (CustomSeekBarPreference) findPreference("timeLongPressTrigger");
         seek2.setMin(100);