diff --git a/src/deluge.py b/src/deluge.py
index f7d0a17c9..2450f91da 100644
--- a/src/deluge.py
+++ b/src/deluge.py
@@ -711,7 +711,7 @@ class Manager:
 		if no_space:
 			self.apply_queue()
 
-		return ret, no_space
+		return (ret, no_space)
 
 	def get_queue_index(self, unique_ID):
 		return self.state.queue.index(unique_ID)
diff --git a/src/delugegtk.py b/src/delugegtk.py
index 8645f6880..28b7d0081 100644
--- a/src/delugegtk.py
+++ b/src/delugegtk.py
@@ -877,8 +877,9 @@ class DelugeGTK:
 		(unique_id, paused) = self.manager.add_torrent(torrent, path, False)
 #		nice_need = dcommon.fsize(err.needed_space)
 #		nice_free = dcommon.fsize(err.free_space)
-		dgtk.show_popup_warning(self.window, _("There is not enough free space to complete this download.") + \
-			_("Please ensure you have enough space available, then unpause the download."))			
+		if paused:
+			dgtk.show_popup_warning(self.window, _("There is not enough free space to complete this download.") + \
+				_("Please ensure you have enough space available, then unpause the download."))			
 			
 		if append:
 			self.torrent_model.append(self.get_list_from_unique_id(unique_id))