diff --git a/src/client/conversation-list/conversation-list-view.vala b/src/client/conversation-list/conversation-list-view.vala
index a5cee8f..0766703 100644
--- a/src/client/conversation-list/conversation-list-view.vala
+++ b/src/client/conversation-list/conversation-list-view.vala
@@ -348,20 +348,9 @@ public class ConversationListView : Gtk.TreeView {
             return;
         }
         
-        List<Gtk.TreePath> paths = get_all_selected_paths();
-        if (paths.length() == 0) {
-            // only notify if this is different than what was previously reported
-            if (selected.size != 0) {
-                selected.clear();
-                conversations_selected(selected.read_only_view);
-            }
-            
-            return;
-        }
-        
         // Conversations are selected, so collect them and signal if different
         Gee.HashSet<Geary.App.Conversation> new_selected = new Gee.HashSet<Geary.App.Conversation>();
-        foreach (Gtk.TreePath path in paths) {
+        foreach (Gtk.TreePath path in get_all_selected_paths()) {
             Geary.App.Conversation? conversation = conversation_list_store.get_conversation_at_path(path);
             if (conversation != null)
                 new_selected.add(conversation);
diff --git a/src/client/conversation-viewer/conversation-viewer.vala b/src/client/conversation-viewer/conversation-viewer.vala
index 2704986..f151a36 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -449,7 +449,13 @@ public class ConversationViewer : Gtk.Box {
         GearyApplication.instance.controller.enable_message_buttons(false);
         
         if (conversations == null || conversations.size == 0 || current_folder == null) {
-            show_multiple_selected(0);
+            if (GearyApplication.instance.controller.any_inline_composers()) {
+                clear(current_folder, current_folder.account.information);
+                web_view.scroll_reset();
+            } else {
+                show_multiple_selected(0);
+            }
+            
             return;
         }
         
