diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 88a4b3c28f..d4e9aad9f5 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1362,8 +1362,12 @@ void PeerListContent::setSearchQuery(
 }
 
 void PeerListContent::submitted() {
-	if (auto row = getRow(_selected.index)) {
+	if (const auto row = getRow(_selected.index)) {
 		_controller->rowClicked(row);
+	} else if (showingSearch()) {
+		if (const auto row = getRow(RowIndex(0))) {
+			_controller->rowClicked(row);
+		}
 	}
 }