diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 5d6bc87c5..40b61739a 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -1105,7 +1105,10 @@ void MessagesDialog::removemessage()
 
 void MessagesDialog::messageRemoved()
 {
-	ui.messageTreeWidget->setCurrentIndex(lastSelectedIndex);
+	if (lastSelectedIndex.isValid())
+		ui.messageTreeWidget->setCurrentIndex(lastSelectedIndex);
+	else
+		insertMsgTxtAndFiles(QModelIndex());
 }
 
 void MessagesDialog::undeletemessage()