diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 027d4551b..07a399583 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -729,6 +729,8 @@ PRIVATE
     main/main_session.h
     main/main_session_settings.cpp
     main/main_session_settings.h
+    media/system_media_controls_manager.h
+    media/system_media_controls_manager.cpp
     media/audio/media_audio.cpp
     media/audio/media_audio.h
     media/audio/media_audio_capture.cpp
@@ -1086,8 +1088,6 @@ PRIVATE
     window/section_memento.h
     window/section_widget.cpp
     window/section_widget.h
-    window/system_media_controls_manager.cpp
-    window/system_media_controls_manager.h
     window/window_connecting_widget.cpp
     window/window_connecting_widget.h
     window/window_controller.cpp
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 91a30aeeb..bb39fb390 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_account.h" // Account::sessionValue.
 #include "main/main_domain.h"
 #include "mainwidget.h"
+#include "media/system_media_controls_manager.h"
 #include "boxes/confirm_box.h"
 #include "boxes/connection_box.h"
 #include "storage/storage_account.h"
@@ -45,7 +46,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_warning.h"
-#include "window/system_media_controls_manager.h"
 #include "window/window_lock_widgets.h"
 #include "window/window_main_menu.h"
 #include "window/window_controller.h" // App::wnd.
@@ -133,8 +133,8 @@ void MainWindow::initHook() {
 		[=] { checkHistoryActivation(); },
 		Qt::QueuedConnection);
 
-	if (Window::SystemMediaControlsManager::Supported()) {
-		using MediaManager = Window::SystemMediaControlsManager;
+	if (Media::SystemMediaControlsManager::Supported()) {
+		using MediaManager = Media::SystemMediaControlsManager;
 		_mediaControlsManager = std::make_unique<MediaManager>(&controller());
 	}
 }
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 6bf0b3e40..39cdb2f83 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -19,12 +19,15 @@ class Widget;
 enum class EnterPoint : uchar;
 } // namespace Intro
 
+namespace Media {
+class SystemMediaControlsManager;
+} // namespace Media
+
 namespace Window {
 class MediaPreviewWidget;
 class SectionMemento;
 struct SectionShow;
 class PasscodeLockWidget;
-class SystemMediaControlsManager;
 namespace Theme {
 struct BackgroundUpdate;
 class WarningWidget;
@@ -131,8 +134,7 @@ private:
 
 	QPixmap grabInner();
 
-	using MediaControlsManager = Window::SystemMediaControlsManager;
-	std::unique_ptr<MediaControlsManager> _mediaControlsManager;
+	std::unique_ptr<Media::SystemMediaControlsManager> _mediaControlsManager;
 
 	QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64;
 
diff --git a/Telegram/SourceFiles/window/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
similarity index 98%
rename from Telegram/SourceFiles/window/system_media_controls_manager.cpp
rename to Telegram/SourceFiles/media/system_media_controls_manager.cpp
index b21de65f7..1335ca06f 100644
--- a/Telegram/SourceFiles/window/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "window/system_media_controls_manager.h"
+#include "media/system_media_controls_manager.h"
 
 #include "base/observer.h"
 #include "base/platform/base_platform_system_media_controls.h"
@@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_song_document_name.h"
 #include "window/window_controller.h"
 
-namespace Window {
+namespace Media {
 
 bool SystemMediaControlsManager::Supported() {
 	return base::Platform::SystemMediaControls::Supported();
@@ -253,4 +253,4 @@ SystemMediaControlsManager::SystemMediaControlsManager(
 
 SystemMediaControlsManager::~SystemMediaControlsManager() = default;
 
-}  // namespace Window
+}  // namespace Media
diff --git a/Telegram/SourceFiles/window/system_media_controls_manager.h b/Telegram/SourceFiles/media/system_media_controls_manager.h
similarity index 96%
rename from Telegram/SourceFiles/window/system_media_controls_manager.h
rename to Telegram/SourceFiles/media/system_media_controls_manager.h
index 50c02ae01..0f6738119 100644
--- a/Telegram/SourceFiles/window/system_media_controls_manager.h
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.h
@@ -23,7 +23,7 @@ namespace Media::Streaming {
 class Instance;
 } // namespace Media::Streaming
 
-namespace Window {
+namespace Media {
 
 class SystemMediaControlsManager {
 public:
@@ -43,4 +43,4 @@ private:
 	rpl::lifetime _lifetime;
 };
 
-}  // namespace Window
+}  // namespace Media