diff --git a/app/src/main/res/layout/osm_upload.xml b/app/src/main/res/layout/osm_upload.xml
index be17e672..0b327807 100644
--- a/app/src/main/res/layout/osm_upload.xml
+++ b/app/src/main/res/layout/osm_upload.xml
@@ -32,9 +32,16 @@
             android:text="@string/tracklogger_btnBack" />
     </LinearLayout>
 
-    <include
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/trackdetail_fields" />
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_above="@id/trackdetail_buttons"
+            android:orientation="vertical" >
+
+        <include
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/trackdetail_fields" />
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file