diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 51d963a..e0acf44 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -1033,10 +1033,12 @@
 
         switch (request) {
             case EditorListener.EDITOR_FORM_CHANGED:
-                if (nameEditor.areOptionalFieldsVisible()) {
-                    switchFromFullNameToStructuredName(nameEditor);
-                } else {
-                    switchFromStructuredNameToFullName(nameEditor);
+                if (nameEditor.hasShortAndLongForms()) {
+                    if (nameEditor.areOptionalFieldsVisible()) {
+                        switchFromFullNameToStructuredName(nameEditor);
+                    } else {
+                        switchFromStructuredNameToFullName(nameEditor);
+                    }
                 }
                 break;