1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala
index a7ea2887..e5f5aaf1 100644
--- a/plugins/openpgp/src/account_settings_widget.vala
+++ b/plugins/openpgp/src/account_settings_widget.vala
@@ -31,7 +31,7 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
     }
 
     public void deactivate() {
-        this.set_visible_child_name("label");
+        set_visible_child_name("label");
     }
 
     public void set_account(Account account) {
@@ -45,7 +45,8 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
 
     private void on_button_clicked() {
         activated();
-        this.set_visible_child_name("entry");
+        set_visible_child_name("entry");
+        combobox.grab_focus();
         combobox.popup();
     }