diff --git a/MyTracks/res/layout/activity_type_preference.xml b/MyTracks/res/layout/activity_type_preference.xml
index 365450a03..b56c2205c 100644
--- a/MyTracks/res/layout/activity_type_preference.xml
+++ b/MyTracks/res/layout/activity_type_preference.xml
@@ -14,22 +14,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="match_parent"
-  android:paddingLeft="8dp"
-  android:paddingRight="8dp"
-  android:paddingTop="16dp" >
-  <AutoCompleteTextView
-    android:hint="@string/track_edit_activity_type_hint"
-    android:id="@+id/activity_type_preference_text_view"
-    android:layout_height="match_parent"
-    android:layout_weight="1"
-    android:layout_width="0dp"
-    style="@style/EditCategory" />
-  <Spinner
-    android:id="@+id/activity_type_preference_spinner"
-    android:layout_gravity="bottom"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
+  <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="wrap_content" />
-</LinearLayout>
\ No newline at end of file
+    android:layout_width="match_parent"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="16dp" >
+    <AutoCompleteTextView
+      android:hint="@string/track_edit_activity_type_hint"
+      android:id="@+id/activity_type_preference_text_view"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:layout_width="0dp"
+      style="@style/EditCategory" />
+    <Spinner
+      android:id="@+id/activity_type_preference_spinner"
+      android:layout_gravity="bottom"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" />
+  </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/layout/choose_activity_type.xml b/MyTracks/res/layout/choose_activity_type.xml
index 3c1c7e3b1..aa4a44192 100644
--- a/MyTracks/res/layout/choose_activity_type.xml
+++ b/MyTracks/res/layout/choose_activity_type.xml
@@ -14,54 +14,57 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="match_parent"
-  android:orientation="vertical" >
-  <GridView
-    android:id="@+id/choose_activity_type_grid_view"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:numColumns="4"
-    android:padding="4dp"
-    android:stretchMode="spacingWidth"
-    android:verticalSpacing="4dp" />
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
   <LinearLayout
-    android:id="@+id/choose_activity_type_weight_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="vertical" >
-    <TextView
-      android:id="@+id/choose_activity_type_weight_label"
-      android:layout_marginBottom="2dp"
-      android:layout_marginLeft="16dp"
-      android:layout_marginRight="16dp"
-      android:layout_marginTop="4dp"
-      android:paddingLeft="12dp"
-      style="@style/TextMedium" />
-    <FrameLayout
+    <GridView
+      android:id="@+id/choose_activity_type_grid_view"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent" >
-      <EditText
-        android:id="@+id/choose_activity_type_weight"
-        android:inputType="numberDecimal"
-        android:layout_marginBottom="4dp"
+      android:layout_width="match_parent"
+      android:numColumns="4"
+      android:padding="4dp"
+      android:stretchMode="spacingWidth"
+      android:verticalSpacing="4dp" />
+    <LinearLayout
+      android:id="@+id/choose_activity_type_weight_container"
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:orientation="vertical" >
+      <TextView
+        android:id="@+id/choose_activity_type_weight_label"
+        android:layout_marginBottom="2dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginTop="2dp"
-        android:layout_width="match_parent"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
+        android:layout_marginTop="4dp"
+        android:paddingLeft="12dp"
         style="@style/TextMedium" />
-      <ImageButton
-        android:background="@android:color/transparent"
-        android:id="@+id/choose_activity_type_weight_image_button"
-        android:layout_gravity="right|center_vertical"
+      <FrameLayout
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
-        android:layout_width="wrap_content"
-        android:paddingRight="12dp"
-        android:src="@android:drawable/ic_menu_close_clear_cancel" />
-    </FrameLayout>
+        android:layout_width="fill_parent" >
+        <EditText
+          android:id="@+id/choose_activity_type_weight"
+          android:inputType="numberDecimal"
+          android:layout_marginBottom="4dp"
+          android:layout_marginLeft="16dp"
+          android:layout_marginRight="16dp"
+          android:layout_marginTop="2dp"
+          android:layout_width="match_parent"
+          android:selectAllOnFocus="true"
+          android:singleLine="true"
+          style="@style/TextMedium" />
+        <ImageButton
+          android:background="@android:color/transparent"
+          android:id="@+id/choose_activity_type_weight_image_button"
+          android:layout_gravity="right|center_vertical"
+          android:layout_height="wrap_content"
+          android:layout_marginRight="16dp"
+          android:layout_width="wrap_content"
+          android:paddingRight="12dp"
+          android:src="@android:drawable/ic_menu_close_clear_cancel" />
+      </FrameLayout>
+    </LinearLayout>
   </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file