2 files changed, 6 insertions, 12 deletions
diff --git a/main/src/ui/conversation_titlebar/file_entry.vala b/main/src/ui/conversation_titlebar/file_entry.vala
index cb7d0807..0f0eb6d6 100644
--- a/main/src/ui/conversation_titlebar/file_entry.vala
+++ b/main/src/ui/conversation_titlebar/file_entry.vala
@@ -55,12 +55,9 @@ public class FileWidget : Button, Plugins.ConversationTitlebarWidget {
     }
 
     public void on_upload_available(Account account) {
-        Idle.add(() => {
-            if (conversation != null && conversation.account.equals(account)) {
-                visible = true;
-            }
-            return false;
-        });
+        if (conversation != null && conversation.account.equals(account)) {
+            visible = true;
+        }
     }
 
     public new void set_conversation(Conversation conversation) {
diff --git a/main/src/ui/conversation_titlebar/view.vala b/main/src/ui/conversation_titlebar/view.vala
index bd8fe8c9..baa036a8 100644
--- a/main/src/ui/conversation_titlebar/view.vala
+++ b/main/src/ui/conversation_titlebar/view.vala
@@ -35,12 +35,9 @@ public class ConversationTitlebar : Gtk.HeaderBar {
 
 
         stream_interactor.get_module(MucManager.IDENTITY).subject_set.connect((account, jid, subject) => {
-            Idle.add(() => {
-                if (conversation != null && conversation.counterpart.equals_bare(jid) && conversation.account.equals(account)) {
-                    update_subtitle(subject);
-                }
-                return false;
-            });
+            if (conversation != null && conversation.counterpart.equals_bare(jid) && conversation.account.equals(account)) {
+                update_subtitle(subject);
+            }
         });
     }