cfix: DND: Fix moving chat list items to other workspaces

1 files changed, 8 insertions, 1 deletions

diff --git a/gajim/gtk/chat_list_stack.py b/gajim/gtk/chat_list_stack.py
index 7a603287e..1e13f6256 100644
--- a/gajim/gtk/chat_list_stack.py
+++ b/gajim/gtk/chat_list_stack.py
@@ -243,7 +243,14 @@ class ChatListStack(Gtk.Stack, EventHelper):
         if not workspace_id:
             workspace_id = app.window.add_workspace(switch=False)
 
-        source_chatlist = self.get_chatlist(params.source_workspace_id)
+        if not params.source_workspace_id:
+            source_chatlist = self.get_current_chat_list()
+            if source_chatlist is None:
+                return
+
+        else:
+            source_chatlist = self.get_chatlist(params.source_workspace_id)
+
         type_ = source_chatlist.get_chat_type(params.account, params.jid)
         if type_ is None:
             return