diff --git a/res/layout/edit_add_field.xml b/res/layout/edit_add_field.xml
index ea334da..d35f1c9 100644
--- a/res/layout/edit_add_field.xml
+++ b/res/layout/edit_add_field.xml
@@ -19,7 +19,9 @@
     android:layout_height="wrap_content"
     android:minHeight="48dip"
     android:paddingLeft="@dimen/editor_add_field_label_left_padding"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:focusable="true"
+    android:clickable="true">
     <TextView
         android:id="@+id/add_text"
         android:layout_gravity="center_vertical"
diff --git a/res/layout/organization_editor_view_switcher.xml b/res/layout/organization_editor_view_switcher.xml
index a0085b2..1862b61 100644
--- a/res/layout/organization_editor_view_switcher.xml
+++ b/res/layout/organization_editor_view_switcher.xml
@@ -34,7 +34,9 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorSecondary"
         android:background="?android:attr/selectableItemBackground"
-        android:text="@string/add_organization"/>
+        android:text="@string/add_organization"
+        android:focusable="true"
+        android:clickable="true"/>
 
     <!-- This is later populated with the actual editable text fields for "organization" -->
     <FrameLayout