diff --git a/src/gajim.py b/src/gajim.py
index 9449d1ed5..ef39a9ccf 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1437,8 +1437,8 @@ class Interface:
 		self.systray.show_icon()
 
 	def hide_systray(self):
-		self.systray.hide_icon()
 		self.systray_enabled = False
+		self.systray.hide_icon()
 	
 	def image_is_ok(self, image):
 		if not os.path.exists(image):
diff --git a/src/systray.py b/src/systray.py
index 5191a9670..8d07f9597 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -345,7 +345,8 @@ class Systray:
 	def on_tray_destroyed(self, widget):
 		'''re-add trayicon when systray is destroyed'''
 		self.t = None
-		self.show_icon()
+		if gajim.interface.systray_enabled:
+			self.show_icon()
 
 	def show_icon(self):
 		if not self.t: