diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 8f7652acab..d8bbb5de4a 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -455,7 +455,7 @@ void MainWindow::firstShow() {
 #else
 	trayIconMenu = new QMenu(this);
 #endif
-	QString notificationItem = lang(cDesktopNotify()
+	auto notificationItem = lang(cDesktopNotify()
 		? lng_disable_notifications_from_tray : lng_enable_notifications_from_tray);
 
 	if (cPlatform() == dbipWindows || cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
@@ -469,9 +469,10 @@ void MainWindow::firstShow() {
 		trayIconMenu->addAction(lang(lng_quit_from_tray), this, SLOT(quitFromTray()))->setEnabled(true);
 	}
 	psUpdateWorkmode();
-
 	psFirstShow();
 	updateTrayMenu();
+
+	_mediaView = new MediaView();
 }
 
 QWidget *MainWindow::filedialogParent() {
@@ -667,8 +668,6 @@ void MainWindow::setupMain(bool anim, const MTPUser *self) {
 	fixOrder();
 
 	updateTitleStatus();
-
-	_mediaView = new MediaView();
 }
 
 void MainWindow::updateUnreadCounter() {
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index e262aa7da5..9f3d29fabd 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -80,8 +80,7 @@ MediaView::MediaView() : TWidget(App::wnd())
 , _radial(animation(this, &MediaView::step_radial))
 , _lastAction(-st::mvDeltaFromLastAction, -st::mvDeltaFromLastAction)
 , _a_state(animation(this, &MediaView::step_state))
-, _dropdown(this, st::mvDropdown)
-, _saveMsgOpacity(0) {
+, _dropdown(this, st::mvDropdown) {
 	TextCustomTagsMap custom;
 	custom.insert(QChar('c'), qMakePair(textcmdStartLink(1), textcmdStopLink()));
 	_saveMsgText.setRichText(st::medviewSaveMsgFont, lang(lng_mediaview_saved), _textDlgOptions, custom);
@@ -100,7 +99,9 @@ MediaView::MediaView() : TWidget(App::wnd())
 
 	hide();
 	createWinId();
-	setWindowState(Qt::WindowFullScreen);
+	if (cPlatform() == dbipWindows) {
+		setWindowState(Qt::WindowFullScreen);
+	}
 
 	_saveMsgUpdater.setSingleShot(true);
 	connect(&_saveMsgUpdater, SIGNAL(timeout()), this, SLOT(updateImage()));
diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h
index 9bc3ab8931..ae07799acc 100644
--- a/Telegram/SourceFiles/mediaview.h
+++ b/Telegram/SourceFiles/mediaview.h
@@ -258,7 +258,7 @@ private:
 
 	QString _saveMsgFilename;
 	uint64 _saveMsgStarted = 0;
-	anim::fvalue _saveMsgOpacity;
+	anim::fvalue _saveMsgOpacity = { 0 };
 	QRect _saveMsg;
 	QTimer _saveMsgUpdater;
 	Text _saveMsgText;