diff --git a/app/src/main/res/layout-sw600dp-land/activity_settings.xml b/app/src/main/res/layout-sw600dp-land/activity_settings.xml
index dbea6dce1..19e3805fc 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_settings.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_settings.xml
@@ -8,6 +8,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="horizontal"
+	android:fitsSystemWindows="true"
 	android:showDividers="middle">
 
 	<!-- this holds the fragment of the "main menu" -->
diff --git a/app/src/main/res/layout/activity_dashclock_settings.xml b/app/src/main/res/layout/activity_dashclock_settings.xml
index 177a162ab..a4f3b3a8b 100644
--- a/app/src/main/res/layout/activity_dashclock_settings.xml
+++ b/app/src/main/res/layout/activity_dashclock_settings.xml
@@ -21,4 +21,5 @@
 	android:id="@+id/fragment"
 	android:name="com.nononsenseapps.notepad.dashclock.DashclockPrefsFragment"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"/>
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"/>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 61a66b241..f64ec18e9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/drawerLayout"
+	android:fitsSystemWindows="true"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".activities.main.ActivityMain">
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 4410add8e..81e300c05 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -3,6 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
 	android:orientation="horizontal">
 
 	<!-- Contains the "main menu" fragment for the settings activity -->
diff --git a/app/src/main/res/layout/activity_shortcut_config.xml b/app/src/main/res/layout/activity_shortcut_config.xml
index 4f6eaee0a..7afee75b8 100644
--- a/app/src/main/res/layout/activity_shortcut_config.xml
+++ b/app/src/main/res/layout/activity_shortcut_config.xml
@@ -5,6 +5,7 @@
 	android:layout_height="wrap_content"
 	android:paddingTop="8dp"
 	android:orientation="vertical"
+	android:fitsSystemWindows="true"
 	tools:context=".widget.shortcut.ShortcutConfig">
 
 	<TextView
diff --git a/app/src/main/res/layout/activity_task_history.xml b/app/src/main/res/layout/activity_task_history.xml
index fd0b70771..53dd94046 100644
--- a/app/src/main/res/layout/activity_task_history.xml
+++ b/app/src/main/res/layout/activity_task_history.xml
@@ -2,6 +2,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:custom="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:fitsSystemWindows="true"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_marginLeft="@dimen/activity_lone_horizontal_margin"
diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml
index 8e5c3233f..ca90d8164 100644
--- a/app/src/main/res/layout/activity_widget_config.xml
+++ b/app/src/main/res/layout/activity_widget_config.xml
@@ -3,6 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
 	android:orientation="@integer/layout_best_orientation">
 
 	<include
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 5b51db66d..20e34c10f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -22,7 +22,8 @@
 	style="?attr/ListMarginStyle"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:fitsSystemWindows="true">
 
 	<!-- Layout file for the "archive" activity of deleted notes. Shows a list of those.
 	 See FragmentSearchDeleted, which decides what gets shown in the listitem -->