diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index c57dc2848..b24546abf 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1615,14 +1615,16 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			const auto o = ScopedPainterOpacity(p, progress);
 			const auto &st = st::msgSelectionCheck;
 			const auto right = delegate()->elementIsChatWide()
-				? (st::msgMaxWidth
-					+ st::msgPhotoSkip
-					+ st::msgSelectionOffset
-					+ st::msgPadding.left()
-					+ st.size)
+				? std::min(
+					(_bubbleWidthLimit
+						+ st::msgPhotoSkip
+						+ st::msgSelectionOffset
+						+ st::msgPadding.left()
+						+ st.size),
+					width())
 				: width();
 			const auto pos = QPoint(
-				(right
+				(width()
 					- (st::msgSelectionOffset * progress - st.size) / 2
 					- st::msgPadding.right() / 2
 					- st.size),