diff --git a/dist/unite@hardpixel.eu/extension.js b/dist/unite@hardpixel.eu/extension.js
index ecf1be4..cefeb1e 100644
--- a/dist/unite@hardpixel.eu/extension.js
+++ b/dist/unite@hardpixel.eu/extension.js
@@ -179,6 +179,7 @@ function disableLeftBox() {
 let buttonsWmHandlers = [];
 let buttonsOvHandlers = [];
 let buttonsDsHandler  = null;
+let buttonsSizeChange = null;
 let buttonsActor      = null;
 let buttonsBox        = null;
 let focusWindow       = null;
@@ -188,13 +189,19 @@ let buttonsCallbacks  = { close: closeWindow, minimize: minimizeWindow, maximize
 function enableButtons() {
   createButtons();
 
-  buttonsDsHandler = global.display.connect('notify::focus-window', updateButtons);
+  buttonsSizeChange = versionCompare(Config.PACKAGE_VERSION, '3.24') < 0;
+  buttonsDsHandler  = global.display.connect('notify::focus-window', updateButtons);
 
   buttonsOvHandlers.push(Main.overview.connect('showing', updateButtons));
   buttonsOvHandlers.push(Main.overview.connect('hidden', updateButtons));
 
-  buttonsWmHandlers.push(global.window_manager.connect('size-changed', updateButtons));
   buttonsWmHandlers.push(global.window_manager.connect('destroy', updateButtons));
+
+  if (buttonsSizeChange) {
+    buttonsWmHandlers.push(global.window_manager.connect('size-change', updateButtons));
+  } else {
+    buttonsWmHandlers.push(global.window_manager.connect('size-changed', updateButtons));
+  }
 }
 
 function disableButtons() {
@@ -212,6 +219,7 @@ function disableButtons() {
   buttonsOvHandlers = [];
   buttonsDsHandler  = null;
   buttonsPosition   = null;
+  buttonsSizeChange = null;
 
   destroyButtons();
 }
@@ -344,16 +352,23 @@ let appmenuWmHandlers = [];
 let appmenuDsHandler  = null;
 let appmenuMtHandler  = null;
 let appmenuBbHandler  = null;
+let appmenuSizeChange = null;
 let activeApp         = null;
 let activeWindow      = null;
 
 function enableAppMenu() {
-  appmenuDsHandler = global.display.connect('notify::focus-window', updateAppMenu);
-  appmenuMtHandler = mtray.connect('source-removed', restoreAppMenuTitle);
-  appmenuBbHandler = mtray._bannerBin.connect('notify::hover', removeAppMenuTitle);
+  appmenuSizeChange = versionCompare(Config.PACKAGE_VERSION, '3.24') < 0;
+  appmenuDsHandler  = global.display.connect('notify::focus-window', updateAppMenu);
+  appmenuMtHandler  = mtray.connect('source-removed', restoreAppMenuTitle);
+  appmenuBbHandler  = mtray._bannerBin.connect('notify::hover', removeAppMenuTitle);
 
-  appmenuWmHandlers.push(global.window_manager.connect('size-changed', updateAppMenu));
   appmenuWmHandlers.push(global.window_manager.connect('destroy', updateAppMenu));
+
+  if (appmenuSizeChange) {
+    appmenuWmHandlers.push(global.window_manager.connect('size-change', updateAppMenu));
+  } else {
+    appmenuWmHandlers.push(global.window_manager.connect('size-changed', updateAppMenu));
+  }
 }
 
 function disableAppMenu() {
@@ -378,6 +393,7 @@ function disableAppMenu() {
   appmenuDsHandler  = null;
   appmenuMtHandler  = null;
   appmenuBbHandler  = null;
+  appmenuSizeChange = null;
   activeApp         = null;
   activeWindow      = null;
 }
diff --git a/src/js/modules/app_menu.js b/src/js/modules/app_menu.js
index f68d545..04ae024 100644
--- a/src/js/modules/app_menu.js
+++ b/src/js/modules/app_menu.js
@@ -2,16 +2,23 @@ let appmenuWmHandlers = [];
 let appmenuDsHandler  = null;
 let appmenuMtHandler  = null;
 let appmenuBbHandler  = null;
+let appmenuSizeChange = null;
 let activeApp         = null;
 let activeWindow      = null;
 
 function enableAppMenu() {
-  appmenuDsHandler = global.display.connect('notify::focus-window', updateAppMenu);
-  appmenuMtHandler = mtray.connect('source-removed', restoreAppMenuTitle);
-  appmenuBbHandler = mtray._bannerBin.connect('notify::hover', removeAppMenuTitle);
+  appmenuSizeChange = versionCompare(Config.PACKAGE_VERSION, '3.24') < 0;
+  appmenuDsHandler  = global.display.connect('notify::focus-window', updateAppMenu);
+  appmenuMtHandler  = mtray.connect('source-removed', restoreAppMenuTitle);
+  appmenuBbHandler  = mtray._bannerBin.connect('notify::hover', removeAppMenuTitle);
 
-  appmenuWmHandlers.push(global.window_manager.connect('size-changed', updateAppMenu));
   appmenuWmHandlers.push(global.window_manager.connect('destroy', updateAppMenu));
+
+  if (appmenuSizeChange) {
+    appmenuWmHandlers.push(global.window_manager.connect('size-change', updateAppMenu));
+  } else {
+    appmenuWmHandlers.push(global.window_manager.connect('size-changed', updateAppMenu));
+  }
 }
 
 function disableAppMenu() {
@@ -36,6 +43,7 @@ function disableAppMenu() {
   appmenuDsHandler  = null;
   appmenuMtHandler  = null;
   appmenuBbHandler  = null;
+  appmenuSizeChange = null;
   activeApp         = null;
   activeWindow      = null;
 }
diff --git a/src/js/modules/buttons.js b/src/js/modules/buttons.js
index 0f3e93b..446ecf2 100644
--- a/src/js/modules/buttons.js
+++ b/src/js/modules/buttons.js
@@ -1,6 +1,7 @@
 let buttonsWmHandlers = [];
 let buttonsOvHandlers = [];
 let buttonsDsHandler  = null;
+let buttonsSizeChange = null;
 let buttonsActor      = null;
 let buttonsBox        = null;
 let focusWindow       = null;
@@ -10,13 +11,19 @@ let buttonsCallbacks  = { close: closeWindow, minimize: minimizeWindow, maximize
 function enableButtons() {
   createButtons();
 
-  buttonsDsHandler = global.display.connect('notify::focus-window', updateButtons);
+  buttonsSizeChange = versionCompare(Config.PACKAGE_VERSION, '3.24') < 0;
+  buttonsDsHandler  = global.display.connect('notify::focus-window', updateButtons);
 
   buttonsOvHandlers.push(Main.overview.connect('showing', updateButtons));
   buttonsOvHandlers.push(Main.overview.connect('hidden', updateButtons));
 
-  buttonsWmHandlers.push(global.window_manager.connect('size-changed', updateButtons));
   buttonsWmHandlers.push(global.window_manager.connect('destroy', updateButtons));
+
+  if (buttonsSizeChange) {
+    buttonsWmHandlers.push(global.window_manager.connect('size-change', updateButtons));
+  } else {
+    buttonsWmHandlers.push(global.window_manager.connect('size-changed', updateButtons));
+  }
 }
 
 function disableButtons() {
@@ -34,6 +41,7 @@ function disableButtons() {
   buttonsOvHandlers = [];
   buttonsDsHandler  = null;
   buttonsPosition   = null;
+  buttonsSizeChange = null;
 
   destroyButtons();
 }