diff --git a/ChangeLog b/ChangeLog
index ef50452c2..94b8afaee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Deluge 0.5.8RC2 (25 December 2007)
   * Set the advanced webui template as default
   * Cut down significantly on the memory usage of the blocklist plugin
   * Fix some UPnP bugs
+  * Fix "New version" alert from freezing sometimes
   * Prioritizes local peers over non-local ones when finding connect
   * Wish everyone a happy holiday :)
 
diff --git a/src/common.py b/src/common.py
index f7f68d465..33b5bd108 100644
--- a/src/common.py
+++ b/src/common.py
@@ -235,35 +235,6 @@ def send_info():
                f.close
     Send_Info_Thread().start()
 
-def new_release_check():
-    import threading
-    class ReleaseThread(threading.Thread):
-       def __init__(self):
-           threading.Thread.__init__(self)
-       def run(self):
-           import urllib
-           try:
-               new_release = urllib.urlopen("http://download.deluge-torrent.org/\
-version").read().strip()
-           except IOError:
-               print "Network error while trying to check for a newer version of \
-Deluge"
-               new_release = ""
-
-           if new_release > PROGRAM_VERSION:
-               import gtk
-               import dialogs
-               gtk.gdk.threads_enter()
-               result = dialogs.show_popup_question(None, _("There is a newer version \
-of Deluge.  Would you like to be taken to our download site?"))
-               gtk.gdk.threads_leave()
-               if result:
-                   open_url_in_browser('http://download.deluge-torrent.org/')
-               else:
-                   pass
-    ReleaseThread().start()
-    return True
-
 # Encryption States
 class EncState:
     forced, enabled, disabled = range(3)
diff --git a/src/interface.py b/src/interface.py
index 2670a4c1e..0f0285840 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -183,15 +183,6 @@ class DelugeGTK:
             except AttributeError:
                 pass
 
-        def new_release_check():
-            try:
-                common.new_release_check()
-            except:
-                pass
-
-        if self.config.get("new_releases"):
-            new_release_check()
-
     def connect_signals(self):
         self.wtree.signal_autoconnect({
                     ## File Menu
@@ -1036,15 +1027,15 @@ window, please enter your password"))
         if cmd_line_torrents is None:
             cmd_line_torrents = []
         
-        if not(self.config.get("start_in_tray") and \
-               self.config.get("enable_system_tray") and 
-               self.has_tray) and not self.window.get_property("visible"):
-            print "Showing window"
         if self.config.get("use_internal"):
             self.browserbutton.show_all()
         else:
             self.browserbutton.hide_all()
 
+        if not(self.config.get("start_in_tray") and \
+               self.config.get("enable_system_tray") and 
+               self.has_tray) and not self.window.get_property("visible"):
+            print "Showing window"
             self.window.show()
         
         ## add torrents in manager's queue to interface
@@ -1063,7 +1054,7 @@ window, please enter your password"))
         # Load plugins after we showed main window (if not started in tray)
         self.load_plugins()
         self.load_tabs_order()
-
+        self.new_release_check()
 
         try:
             gobject.threads_init()
@@ -1073,6 +1064,35 @@ window, please enter your password"))
         except KeyboardInterrupt:
             self.manager.quit()
 
+    def new_release_check(self):
+        import socket
+        import urllib2
+        timeout = 5
+        socket.setdefaulttimeout(timeout)
+        try:
+            gtk.gdk.threads_enter()
+        except:
+            pass
+        try:
+            req = urllib2.Request("http://download.deluge-torrent.org/version")
+            new_release = urllib2.urlopen(req).read().strip()
+        except IOError:
+            print "Network error while trying to check for a newer version of \
+Deluge"
+            new_release = ""
+
+        if new_release > common.PROGRAM_VERSION:
+            result = dialogs.show_popup_question(None, _("There is a newer version \
+of Deluge.  Would you like to be taken to our download site?"))
+            if result:
+                common.open_url_in_browser('http://download.deluge-torrent.org/')
+            else:
+                pass
+        try:
+            gtk.gdk.threads_leave()
+        except:
+            pass
+
     def load_plugins(self):
         enable_plugins = self.config.get('enabled_plugins').split(':')
         for plugin in enable_plugins: