diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 49887732a..922c2ffbc 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -3188,6 +3188,7 @@ void HistoryWidget::updateControlsVisibility() {
 		_cmdStart.hide();
 		_attachType.hide();
 		_emojiPan.hide();
+		_kbScroll.hide();
 		if (!_field.isHidden()) {
 			_field.hide();
 			resizeEvent(0);
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 13931cea0..45c06b49f 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -1567,7 +1567,7 @@ void Window::notifyUpdateAllPhotos() {
             (*i)->updatePeerPhoto();
         }
     }
-	if (_mediaView) _mediaView->updateControls();
+	if (_mediaView && !_mediaView->isHidden()) _mediaView->updateControls();
 }
 
 void Window::notifyUpdateAll() {