diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py
index e84ec2459..13ac640d6 100644
--- a/deluge/ui/gtkui/addtorrentdialog.py
+++ b/deluge/ui/gtkui/addtorrentdialog.py
@@ -180,7 +180,11 @@ class AddTorrentDialog(component.Component):
             self.builder.get_object("button_move_completed_location").hide()
             self.builder.get_object("entry_move_completed_path").show()
 
-        self.dialog.set_transient_for(component.get("MainWindow").window)
+        if component.get("MainWindow").is_on_active_workspace():
+            self.dialog.set_transient_for(component.get("MainWindow").window)
+        else:
+            self.dialog.set_transient_for(None)
+
         self.dialog.present()
         if focus:
             self.dialog.window.focus()
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index d491441d0..4d07a5750 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -42,6 +42,11 @@ import gtk
 import logging
 import urllib
 
+try:
+    import wnck
+except ImportError:
+    wnck = None
+
 from deluge.ui.client import client
 import deluge.component as component
 from deluge.configmanager import ConfigManager
@@ -76,6 +81,8 @@ class _GtkBuilderSignalsHolder(object):
 
 class MainWindow(component.Component):
     def __init__(self):
+        if wnck:
+            self.screen = wnck.screen_get_default()
         component.Component.__init__(self, "MainWindow", interval=2)
         self.config = ConfigManager("gtkui.conf")
         self.gtk_builder_signals_holder = _GtkBuilderSignalsHolder()
@@ -167,7 +174,6 @@ class MainWindow(component.Component):
             component.resume("TorrentDetails")
         except:
             pass
-
         self.window.show()
 
 
@@ -324,3 +330,11 @@ class MainWindow(component.Component):
     def on_torrentfinished_event(self, torrent_id):
         from deluge.ui.gtkui.notification import Notification
         Notification().notify(torrent_id)
+
+    def is_on_active_workspace(self):
+        # Returns True if mainwindow is on active workspace or wnck module not available
+        if not wnck:
+            return True
+        for win in self.screen.get_windows():
+            if win.get_xid() == self.window.window.xid:
+                return win.is_on_workspace(win.get_screen().get_active_workspace())