diff --git a/src/config.py b/src/config.py
index 8040f8ced70ebad522109c9bdc6b2f2d41262359..6225b896dc18b724de612a1415bff534aa994534 100644
--- a/src/config.py
+++ b/src/config.py
@@ -622,6 +622,7 @@ class PreferencesWindow:
 			self.theme_preferences = dialogs.GajimThemesWindow()
 		else:
 			self.theme_preferences.window.present()
+			self.theme_preferences.select_active_theme()
 
 	def on_theme_combobox_changed(self, widget):
 		model = widget.get_model()
diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py
index 93e979cdaf5a3aa68ae2134b7356e7180bf9c03b..6b0200ecbd1cad4a6af5d064c25cf43bc08b0e3a 100644
--- a/src/gajim_themes_window.py
+++ b/src/gajim_themes_window.py
@@ -121,7 +121,20 @@ class GajimThemesWindow:
 				self.themes_tree.get_selection().select_iter(iter)
 				self.xml.get_widget('remove_button').set_sensitive(True)
 				self.theme_options_vbox.set_sensitive(True)
-	
+
+	def select_active_theme(self):
+		model = self.themes_tree.get_model()
+		iter = model.get_iter_root()
+		active_theme = gajim.config.get('roster_theme')
+		while iter:
+			theme = model[iter][0]
+			if theme == active_theme:
+				self.themes_tree.get_selection().select_iter(iter)
+				self.xml.get_widget('remove_button').set_sensitive(True)
+				self.theme_options_vbox.set_sensitive(True)
+				break
+			iter = model.iter_next(iter)
+
 	def selection_changed(self, widget = None):
 		(model, iter) = self.themes_tree.get_selection().get_selected()
 		selected = self.themes_tree.get_selection().get_selected_rows()