diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index e32ce5a12..a31370b16 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -669,7 +669,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
                 }
             }
 
-            if (!$content && !$edit_mode)
+            if (!$content && (!$edit_mode || !$select_add->_count))
                 continue;
 
             // also render add-field selector