diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 5370bccb..0b3c4f4a 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -678,8 +678,14 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         pass
     
     def statusicon_activate(self, widget, data = None):
-        self.window.show()
-        self.window.present()
+        # Let's allow the tray icon to toggle window visibility, the way
+        # most other apps work
+        shown = self.window.get_property('visible')
+        if shown:
+            self.window.hide()
+        else:
+            self.window.show()
+            self.window.present()
         
     def warning_box(self, str, diatitle="FPDB WARNING"):
             diaWarning = gtk.Dialog(title=diatitle, parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))