diff --git a/src/config/theme.c b/src/config/theme.c
index 79afacd1..70b02b2f 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -56,10 +56,9 @@
 #include "config/preferences.h"
 #include "config/color.h"
 
-static GString* theme_loc;
-static GKeyFile* theme;
-static GHashTable* bold_items;
-static GHashTable* defaults;
+static GString* theme_loc = NULL;
+static GKeyFile* theme = NULL;
+static GHashTable* defaults = NULL;
 
 static void _load_preferences(void);
 static void _theme_list_dir(const gchar* const dir, GSList** result);
@@ -78,10 +77,6 @@ _theme_close(void)
         g_string_free(theme_loc, TRUE);
         theme_loc = NULL;
     }
-    if (bold_items) {
-        g_hash_table_destroy(bold_items);
-        bold_items = NULL;
-    }
     if (defaults) {
         g_hash_table_destroy(defaults);
         defaults = NULL;
@@ -91,6 +86,12 @@ _theme_close(void)
 void
 theme_init(const char* const theme_name)
 {
+    if (defaults || theme_loc || theme) {
+        log_warning("theme_init(): Detected non-NULL state (theme=%p, theme_loc=%p, defaults=%p). Cleaning up previous initialization.",
+                    theme, theme_loc, defaults);
+        _theme_close();
+    }
+
     if (!_theme_load_file(theme_name)) {
         log_error("Loading theme %s failed.", theme_name);
 
diff --git a/src/event/server_events.c b/src/event/server_events.c
index 20ab28c5..cf25773d 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -156,14 +156,7 @@ sv_ev_roster_received(void)
         if (!p_gpg_valid_key(account->pgp_keyid, &err_str)) {
             cons_show_error("Invalid PGP key ID specified: %s, %s", account->pgp_keyid, err_str);
         }
-
-        // Redraw the screen after entry of the PGP secret key, but not init
-        ProfWin* win = wins_get_current();
-        auto_gchar gchar* theme = prefs_get_string(PREF_THEME);
-        win_redraw(win);
-        theme_init(theme);
         ui_resize();
-        ui_show_roster();
     }
     account_free(account);
 #endif