diff --git a/AUTHORS b/AUTHORS
index 19dffc61..0b5d570c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,3 +75,4 @@ Jérôme Poulin <jeromepoulin@gmail.com> (ticpu)
 Marco Rodolfi <marco.rodolfi@tuta.io> (RodoMa92)
 Stewart Borle <stewi1014@gmail.com> (stewi1014)
 Jannis Lübke <business.janrupf@gmail.com> (Janrupf)
+Amit Mendapara <282290+cristatus@users.noreply.github.com> (cristatus)
diff --git a/client/displayservers/Wayland/desktops/CMakeLists.txt b/client/displayservers/Wayland/desktops/CMakeLists.txt
index 893fe55c..70f496f5 100644
--- a/client/displayservers/Wayland/desktops/CMakeLists.txt
+++ b/client/displayservers/Wayland/desktops/CMakeLists.txt
@@ -23,7 +23,7 @@ endfunction()
 # the first entry here is the default
 add_desktop(xdg)
 
-pkg_check_modules(LIBDECOR IMPORTED_TARGET libdecor-0)
+pkg_check_modules(LIBDECOR IMPORTED_TARGET libdecor-0>=0.1.1)
 if(LIBDECOR_FOUND)
   option(ENABLE_LIBDECOR "Build with libdecor support" ON)
 else()
diff --git a/client/displayservers/Wayland/desktops/libdecor/libdecor.c b/client/displayservers/Wayland/desktops/libdecor/libdecor.c
index 0eaef2f9..a588fbfc 100644
--- a/client/displayservers/Wayland/desktops/libdecor/libdecor.c
+++ b/client/displayservers/Wayland/desktops/libdecor/libdecor.c
@@ -145,9 +145,7 @@ static bool libdecor_shellInit(
   libdecor_frame_map(state.libdecorFrame);
 
   // Get the xdg_toplevel for icon setting
-  struct xdg_surface * xdgSurface = libdecor_frame_get_xdg_surface(state.libdecorFrame);
-  if (xdgSurface)
-    wlWm.xdgToplevel = xdg_surface_get_toplevel(xdgSurface);
+  wlWm.xdgToplevel = libdecor_frame_get_xdg_toplevel(state.libdecorFrame);
 
   if (fullscreen)
     libdecor_frame_set_fullscreen(state.libdecorFrame, NULL);