diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 70bda0970..b083f694c 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -633,20 +633,19 @@ UINT MainWindow::_taskbarCreatedMsgId = 0;
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Window::MainWindow(controller)
 , ps_tbHider_hWnd(createTaskbarHider()) {
-	if (!UseNativeDecorations()) {
-		QCoreApplication::instance()->installNativeEventFilter(
-			EventFilter::CreateInstance(this));
+	QCoreApplication::instance()->installNativeEventFilter(
+		EventFilter::CreateInstance(this));
 
+	if (!_taskbarCreatedMsgId) {
+		_taskbarCreatedMsgId = RegisterWindowMessage(L"TaskbarButtonCreated");
+	}
+	if (!UseNativeDecorations()) {
 		subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
 			if (update.paletteChanged()) {
 				_psShadowWindows.setColor(st::windowShadowFg->c);
 			}
 		});
 	}
-
-	if (!_taskbarCreatedMsgId) {
-		_taskbarCreatedMsgId = RegisterWindowMessage(L"TaskbarButtonCreated");
-	}
 }
 
 void MainWindow::TaskbarCreated() {
@@ -1008,9 +1007,7 @@ MainWindow::~MainWindow() {
 	}
 	if (ps_tbHider_hWnd) DestroyWindow(ps_tbHider_hWnd);
 
-	if (!UseNativeDecorations()) {
-		EventFilter::Destroy();
-	}
+	EventFilter::Destroy();
 }
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
index 511a7e57a..5f25f04ca 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
@@ -92,6 +92,10 @@ bool EventFilter::mainWindowEvent(
 		}
 	}
 
+	if (UseNativeDecorations()) {
+		return false;
+	}
+
 	switch (msg) {
 
 	case WM_TIMECHANGE: {