diff --git a/src/window.rs b/src/window.rs
index 715fff05b9..bc4e6c7e99 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1336,14 +1336,14 @@ impl std::hash::Hash for dyn Window + '_ {
 }
 
 #[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for dyn Window + '_ {
+impl rwh_06::HasDisplayHandle for dyn Surface + '_ {
     fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
         self.rwh_06_display_handle().display_handle()
     }
 }
 
 #[cfg(feature = "rwh_06")]
-impl rwh_06::HasWindowHandle for dyn Window + '_ {
+impl rwh_06::HasWindowHandle for dyn Surface + '_ {
     fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
         self.rwh_06_window_handle().window_handle()
     }