diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index b6a89e16e..7d67206e0 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "history/history_widget.h"
 #include "core/crash_reports.h"
+#include "core/sandbox.h"
 #include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "history/history_location_manager.h"
@@ -38,10 +39,12 @@ public:
 	}
 
 	bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
-		auto wnd = App::wnd();
-		if (!wnd) return false;
+		return Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			auto wnd = App::wnd();
+			if (!wnd) return false;
 
-		return wnd->psFilterNativeEvent(message);
+			return wnd->psFilterNativeEvent(message);
+		});
 	}
 };
 
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 5d21d2629..93f94af5b 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "mainwindow.h"
 #include "mainwidget.h"
+#include "core/sandbox.h"
 #include "core/application.h"
 #include "core/crash_reports.h"
 #include "storage/localstorage.h"
@@ -184,9 +185,11 @@ ApplicationDelegate *_sharedDelegate = nil;
 }
 
 - (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e {
-	if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
-		objc_handleMediaKeyEvent(e);
-	}
+	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+		if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
+			objc_handleMediaKeyEvent(e);
+		}
+	});
 }
 
 - (void) ignoreApplicationActivationRightNow {
diff --git a/Telegram/SourceFiles/ui/effects/animations.h b/Telegram/SourceFiles/ui/effects/animations.h
index 2ca6562e8..38c147a43 100644
--- a/Telegram/SourceFiles/ui/effects/animations.h
+++ b/Telegram/SourceFiles/ui/effects/animations.h
@@ -15,6 +15,8 @@ class Manager;
 class Basic final {
 public:
 	Basic() = default;
+	Basic(const Basic &other) = delete;
+	Basic &operator=(const Basic &other) = delete;
 
 	template <typename Callback>
 	explicit Basic(Callback &&callback);