diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 67847f621b..d3733e3da5 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -376,6 +376,24 @@ namespace Avalonia.Controls
         /// </summary>
         public ITopLevelImpl? PlatformImpl { get; private set; }
         
+        /// <summary>
+        /// Trys to get the platform handle for the TopLevel-derived control.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IPlatformHandle"/> describing the window handle, or null if the handle
+        /// could not be retrieved.
+        /// </returns>
+        public IPlatformHandle? TryGetPlatformHandle() => PlatformImpl?.Handle;
+
+        /// <summary>
+        /// Trys to get the platform handle for the TopLevel-derived control.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="IPlatformHandle"/> describing the window handle, or null if the handle
+        /// could not be retrieved.
+        /// </returns>
+        public IPlatformHandle? TryGetPlatformHandle() => PlatformImpl?.Handle;
+
         /// <summary>
         /// Gets the renderer for the window.
         /// </summary>
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index b19ad49820..0fad02d72b 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -178,14 +178,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Trys to get the platform handle for the window.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="IPlatformHandle"/> describing the window handle, or null if the handle
-        /// could not be retrieved.
-        /// </returns>
-        public IPlatformHandle? TryGetPlatformHandle() => PlatformImpl?.Handle;
 
         /// <summary>
         /// Ensures that the window is initialized.