diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 84eff2577..23495d24c 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2902,7 +2902,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			HistoryView::EmojiPacksSource::Message,
 			_controller);
 		const auto added = (_menu->actions().size() > wasAmount);
-		if (!added) {
+		if (!added && !_menu->empty()) {
 			_menu->addSeparator();
 		}
 		HistoryView::AddSelectRestrictionAction(
@@ -2916,7 +2916,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			this,
 			leaderOrSelf,
 			_controller);
-	} else {
+	} else if (leaderOrSelf) {
 		HistoryView::MaybeAddWhenEditedAction(_menu, leaderOrSelf);
 	}