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/editor_custom_action_bar.xml b/res/layout/editor_custom_action_bar.xml
index 1040da3..56ac9d0 100644
--- a/res/layout/editor_custom_action_bar.xml
+++ b/res/layout/editor_custom_action_bar.xml
@@ -26,7 +26,9 @@
         android:divider="?android:attr/dividerVertical"
         android:showDividers="end"
         android:dividerPadding="12dip"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:focusable="true"
+        android:clickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml
index 4a7f364..52ea3ad 100644
--- a/res/layout/name_edit_expansion_view.xml
+++ b/res/layout/name_edit_expansion_view.xml
@@ -23,7 +23,9 @@
     android:layout_height="@dimen/editor_min_line_item_height"
     android:layout_gravity="top"
     android:contentDescription="@string/expand_collapse_name_fields_description"
-    android:importantForAccessibility="yes">
+    android:importantForAccessibility="yes"
+    android:focusable="true"
+    android:clickable="true">
     <ImageView
         android:id="@+id/expansion_view"
         android:layout_width="wrap_content"
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