diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index cd7148279..96470a242 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -20,7 +20,8 @@ limitations under the License.
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="true">
 
         <include
             android:id="@+id/fields"
diff --git a/src/main/res/layout/track_recorded.xml b/src/main/res/layout/track_recorded.xml
index 1801ba712..e87df004a 100644
--- a/src/main/res/layout/track_recorded.xml
+++ b/src/main/res/layout/track_recorded.xml
@@ -21,7 +21,8 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="70dp">
+        android:paddingBottom="90dp"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/track_detail_activity_tablayout"
diff --git a/src/main/res/layout/track_recording.xml b/src/main/res/layout/track_recording.xml
index 57b409288..ad503ae98 100644
--- a/src/main/res/layout/track_recording.xml
+++ b/src/main/res/layout/track_recording.xml
@@ -9,7 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="90dp">
+        android:paddingBottom="90dp"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/track_detail_activity_tablayout"
diff --git a/src/main/res/layout/track_stopped.xml b/src/main/res/layout/track_stopped.xml
index 4aca4c419..1296eb0cc 100644
--- a/src/main/res/layout/track_stopped.xml
+++ b/src/main/res/layout/track_stopped.xml
@@ -5,7 +5,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <include
         android:id="@+id/loading_layout"