diff --git a/src/com/android/contacts/ui/widget/GenericEditorView.java b/src/com/android/contacts/ui/widget/GenericEditorView.java
index 40ed5cd..ee5951f 100644
--- a/src/com/android/contacts/ui/widget/GenericEditorView.java
+++ b/src/com/android/contacts/ui/widget/GenericEditorView.java
@@ -290,6 +290,8 @@
                     mEntry.put(mKind.typeColumn, mType.rawValue);
                     mEntry.put(mType.customColumn, customText);
                     rebuildLabel();
+                    if (!mFields.hasFocus())
+                        mFields.requestFocus();
                 }
             }
         });
@@ -346,6 +348,8 @@
                     mType = selected;
                     mEntry.put(mKind.typeColumn, mType.rawValue);
                     rebuildLabel();
+                    if (!mFields.hasFocus())
+                        mFields.requestFocus();
                 }
             }
         };