diff --git a/CHANGELOG b/CHANGELOG
index a0d3984d0..ccf89c308 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ CHANGELOG Roundcube Webmail
 - Managesieve: Fix bug where global includes were requested for vacation (#6716)
 - Managesieve: Use RFC-compliant line endings, CRLF instead of LF (#6686)
 - Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
+- Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
 - Fix so an error is logged when more than one attachment plugin has been enabled, initialize the first one (#6735)
 - Fix bug where flag change could have been passed to a preview frame when not expected
 - Fix bug in HTML parser that could cause missing text fragments when there was no head/body tag (#6713)
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 1a9b8557d..4ca6b85d6 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -65,11 +65,11 @@ $messages['nopubkeyforsender'] = 'No valid public key found for your sender iden
 $messages['encryptnoattachments'] = 'Already uploaded attachments cannot be encrypted. Please re-add them in the encryption editor.';
 $messages['searchpubkeyservers'] = 'Do you want to search public key servers for the missing keys?';
 $messages['encryptpubkeysfound'] = 'The following public keys have been found:';
-$messages['keyservererror'] = 'Failed to get key from keyserver';
-$messages['keyimportsuccess'] = 'Public key $key successfully imported into your key ring';
+$messages['keyservererror'] = 'Failed to get key from keyserver.';
+$messages['keyimportsuccess'] = 'Public key $key successfully imported into your key ring.';
 $messages['nocontactsfound'] = 'No contacts found.';
 $messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
+$messages['contactsearchonly'] = 'You have to use search form to see contacts from the selected addressbook.';
 $messages['sendingfailed'] = 'Failed to send message.';
 $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
 $messages['errorsavingsent'] = 'An error occurred while saving sent message.';
diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
index bf33b2483..9c52a2fe3 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -51,7 +51,7 @@ else {
 
     if (!$result->count && $result->searchonly) {
         $OUTPUT->show_message('contactsearchonly', 'notice');
-        $OUTPUT->command('command', 'advanced-search');
+        // Don't invoke advanced search dialog automatically from here (#6679)
     }
 
     if ($CONTACTS->group_id) {