diff --git a/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java b/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java
index 0dc2a2d0..69bf911c 100644
--- a/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java
+++ b/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java
@@ -111,6 +111,17 @@ public void onCreate(Bundle bundle) {
         // Setup windows inset handling
         WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
 
+        if (Build.VERSION.SDK_INT >= 28) {
+            final int newMode = Build.VERSION.SDK_INT >= 30
+                    ? WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+                    : WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+            final WindowManager.LayoutParams attrs = getWindow().getAttributes();
+            if (attrs.layoutInDisplayCutoutMode != newMode) {
+                attrs.layoutInDisplayCutoutMode = newMode;
+                getWindow().setAttributes(attrs);
+            }
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             getWindow().setStatusBarContrastEnforced(false);
             getWindow().setNavigationBarContrastEnforced(false);
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 191a37fe..83e81bf0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,7 +22,7 @@
         <item name="colorOnSurface">@color/colorOnSurface</item>
         <item name="colorError">@color/colorError</item>
         <item name="colorOnError">@color/colorOnError</item>
-        <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">always</item>
+
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9419839e..4cad179a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ timber = "5.0.1"
 okhttp = "5.3.2"
 typedPreferences = "2.1.0"
 material = "1.13.0"
-core = "1.17.0"
+core = "1.18.0"
 appcompat = "1.7.1"
 annotation = "1.9.1"
 exifinterface = "1.4.2"