diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 87b1c9bb8..a46a42433 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -1481,10 +1481,6 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
 		if (!_selected.isEmpty() && selectedForDelete == selectedForForward) {
 			_widget->onDeleteSelected();
 		}
-	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
-		if (_selected.isEmpty()) {
-			_widget->onListEnterPressed();
-		}
 	} else {
 		e->ignore();
 	}
@@ -7216,6 +7212,8 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 			}
 			_scroll.keyPressEvent(e);
 		}
+	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
+		onListEnterPressed();
 	} else {
 		e->ignore();
 	}