diff --git a/src/Gtk/Avalonia.Gtk/WindowImplBase.cs b/src/Gtk/Avalonia.Gtk/WindowImplBase.cs
index a8bd7836ec..c82d510c64 100644
--- a/src/Gtk/Avalonia.Gtk/WindowImplBase.cs
+++ b/src/Gtk/Avalonia.Gtk/WindowImplBase.cs
@@ -125,6 +125,13 @@ namespace Avalonia.Gtk
 
         public Action<double> ScalingChanged { get; set; }
 
+        public IEnumerable<object> Surfaces => new object[]
+        {
+            Handle,
+            new Func<Gdk.Drawable>(() => CurrentDrawable),
+            _framebuffer
+        };
+
         public IPopupImpl CreatePopup()
         {
             return new PopupImpl();
@@ -316,12 +323,5 @@ namespace Avalonia.Gtk
             _window.Dispose();
             _window = null;
         }
-
-        public IEnumerable<object> Surfaces => new object[]
-        {
-            Handle, 
-            new Func<Gdk.Drawable>(() => CurrentDrawable),
-            _framebuffer
-        };
     }
 }