diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt
index 9168bdd43b..c52dfd796c 100644
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -1016,7 +1016,7 @@ historyToEndSkip: 10px;
 activeFadeInDuration: 500;
 activeFadeOutDuration: 3000;
 
-historyMaxWidth: 640px;
+historyMaxWidth: 680px;
 
 msgRadius: 3px;
 
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index f83156edae..1f1d6bf792 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -57,15 +57,8 @@ namespace {
 				QKeyEvent *ev = static_cast<QKeyEvent*>(e);
 				if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
 					if (ev->key() == Qt::Key_W && (ev->modifiers() & Qt::ControlModifier)) {
-						if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
-							App::wnd()->minimizeToTray();
-							return true;
-						} else {
-							App::wnd()->hide();
-							App::wnd()->updateIsActive(cOfflineBlurTimeout());
-							App::wnd()->updateGlobalMenu();
-							return true;
-						}
+						Ui::hideWindowNoQuit();
+						return true;
 					} else if (ev->key() == Qt::Key_M && (ev->modifiers() & Qt::ControlModifier)) {
 						App::wnd()->setWindowState(Qt::WindowMinimized);
 						return true;
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index 1013d65098..1750f0250b 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -134,6 +134,22 @@ namespace Ui {
 		}
 	}
 
+	bool hideWindowNoQuit() {
+		if (!App::quiting()) {
+			if (Window *w = App::wnd()) {
+				if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
+					return w->minimizeToTray();
+				} else if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
+					w->hide();
+					w->updateIsActive(cOfflineBlurTimeout());
+					w->updateGlobalMenu();
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 }
 
 namespace Notify {
diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h
index ca390d2c3c..43da4a0268 100644
--- a/Telegram/SourceFiles/facades.h
+++ b/Telegram/SourceFiles/facades.h
@@ -67,6 +67,8 @@ namespace Ui {
 		showPeerHistory(PeerId(0), 0);
 	}
 
+	bool hideWindowNoQuit();
+
 };
 
 enum ClipStopperType {
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 89fbecc527..c7cbfe3a67 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -990,7 +990,7 @@ bool Window::eventFilter(QObject *obj, QEvent *evt) {
 	} else if (t == QEvent::MouseButtonRelease) {
 		Ui::hideStickerPreview();
 	}
-	if (obj == App::app()) {
+	if (obj == Application::instance()) {
 		if (t == QEvent::ApplicationActivate) {
 			psUserActionDone();
 			QTimer::singleShot(1, this, SLOT(checkHistoryActivation()));
@@ -1214,7 +1214,7 @@ void Window::toggleDisplayNotifyFromTray() {
 }
 
 void Window::closeEvent(QCloseEvent *e) {
-	if (MTP::authedId() && !Sandbox::isSavingSession() && minimizeToTray()) {
+	if (MTP::authedId() && !Sandbox::isSavingSession() && Ui::hideWindowNoQuit()) {
 		e->ignore();
 	} else {
 		App::quit();