diff --git a/src/browser.py b/src/browser.py
new file mode 100644
index 000000000..da7437164
--- /dev/null
+++ b/src/browser.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+import webbrowser
+import sys
+webbrowser.open(sys.argv[1])
diff --git a/src/common.py b/src/common.py
index 6a6adba7b..c690dfd74 100644
--- a/src/common.py
+++ b/src/common.py
@@ -1,4 +1,5 @@
-# dcommon.py
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) Zach Tibbitts 2006 <zach@collegegeek.org>
 #
@@ -119,22 +120,15 @@ def get_pixmap(fname):
     return os.path.join(PIXMAP_DIR, fname)
     
 def open_url_in_browser(link):
-    import webbrowser
-    
-    # why this method with causes up to 1 minutes delays when opening url in 
-    # deluge ? when you run it from console - works instantly. maybe it has
-    # something to do with libtorrent's threads or with boost mt/nomt ?
-    
-    #import threading
-    #class LaunchBrowser(threading.Thread):
-    #    def run(self):
-    #        try:    
-    #            webbrowser.open(link)
-    #        except webbrowser.Error:
-    #            print _("Error: no webbrowser found")
-    #LaunchBrowser().start()
-    
-    webbrowser.open(link)
+    import platform
+    if platform.system() == "Windows":
+        import webbrowser
+        webbrowser.open(link)
+    else:
+        import os, sys
+        version = sys.version[:3]
+        file = '/usr/lib/python' + version + '/site-packages/deluge/browser.py'
+        os.spawnlp(os.P_NOWAIT, 'python', 'python', file, link)
 
 def is_url(url):
     import re