diff -Nru gnome-shell-extension-ubuntu-dock-72~ubuntu4/appIcons.js gnome-shell-extension-ubuntu-dock-72~ubuntu5/appIcons.js
--- gnome-shell-extension-ubuntu-dock-72~ubuntu4/appIcons.js	2022-04-12 08:01:16.000000000 +0000
+++ gnome-shell-extension-ubuntu-dock-72~ubuntu5/appIcons.js	2022-04-14 20:24:07.000000000 +0000
@@ -1279,7 +1279,7 @@
     }
 
     _setPopupTimeout() {
-        AppDisplay.AppIcon.prototype._onMenuPoppedDown.apply(this, arguments);
+        AppDisplay.AppIcon.prototype._setPopupTimeout.apply(this, arguments);
     }
 
     _removeMenuTimeout() {
diff -Nru gnome-shell-extension-ubuntu-dock-72~ubuntu4/dash.js gnome-shell-extension-ubuntu-dock-72~ubuntu5/dash.js
--- gnome-shell-extension-ubuntu-dock-72~ubuntu4/dash.js	2022-04-12 08:01:16.000000000 +0000
+++ gnome-shell-extension-ubuntu-dock-72~ubuntu5/dash.js	2022-04-14 20:24:07.000000000 +0000
@@ -626,7 +626,7 @@
         let spacing = themeNode.get_length('spacing');
 
         const [{ child: firstButton }] = iconChildren;
-        const { child: firstIcon } = firstButton.icon;
+        const { child: firstIcon } = firstButton?.icon ?? { child: null };
 
         // if no icons there's nothing to adjust
         if (!firstIcon)
diff -Nru gnome-shell-extension-ubuntu-dock-72~ubuntu4/debian/changelog gnome-shell-extension-ubuntu-dock-72~ubuntu5/debian/changelog
--- gnome-shell-extension-ubuntu-dock-72~ubuntu4/debian/changelog	2022-04-12 08:01:16.000000000 +0000
+++ gnome-shell-extension-ubuntu-dock-72~ubuntu5/debian/changelog	2022-04-14 20:24:07.000000000 +0000
@@ -1,3 +1,12 @@
+gnome-shell-extension-ubuntu-dock (72~ubuntu5) jammy; urgency=medium
+
+  * docking: Use proper monitor index variable to support DING integration
+  * locations: Always ignore OR windows in windows-backed app implementation
+  * dash: Handle possible null first button
+  * appIcons: Use proper method on _setPopupTimeout call (LP: #1964996)
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 14 Apr 2022 22:24:07 +0200
+
 gnome-shell-extension-ubuntu-dock (72~ubuntu4) jammy; urgency=medium
 
   * locations: Reintroduce manual rate limiting for trash monitoring to
diff -Nru gnome-shell-extension-ubuntu-dock-72~ubuntu4/docking.js gnome-shell-extension-ubuntu-dock-72~ubuntu5/docking.js
--- gnome-shell-extension-ubuntu-dock-72~ubuntu4/docking.js	2022-04-12 08:01:16.000000000 +0000
+++ gnome-shell-extension-ubuntu-dock-72~ubuntu5/docking.js	2022-04-14 20:24:07.000000000 +0000
@@ -1112,13 +1112,13 @@
 
         const { desktopIconsUsableArea } = DockManager.getDefault();
         if (this._position === St.Side.BOTTOM)
-            desktopIconsUsableArea.setMargins(this._monitorIndex, 0, this._box.height, 0, 0);
+            desktopIconsUsableArea.setMargins(this.monitorIndex, 0, this._box.height, 0, 0);
         else if (this._position === St.Side.TOP)
-            desktopIconsUsableArea.setMargins(this._monitorIndex, this._box.height, 0, 0, 0);
+            desktopIconsUsableArea.setMargins(this.monitorIndex, this._box.height, 0, 0, 0);
         else if (this._position === St.Side.RIGHT)
-            desktopIconsUsableArea.setMargins(this._monitorIndex, 0, 0, 0, this._box.width);
+            desktopIconsUsableArea.setMargins(this.monitorIndex, 0, 0, 0, this._box.width);
         else if (this._position === St.Side.LEFT)
-            desktopIconsUsableArea.setMargins(this._monitorIndex, 0, 0, this._box.width, 0);
+            desktopIconsUsableArea.setMargins(this.monitorIndex, 0, 0, this._box.width, 0);
     }
 
     _updateStaticBox() {
diff -Nru gnome-shell-extension-ubuntu-dock-72~ubuntu4/locations.js gnome-shell-extension-ubuntu-dock-72~ubuntu5/locations.js
--- gnome-shell-extension-ubuntu-dock-72~ubuntu4/locations.js	2022-04-12 08:01:16.000000000 +0000
+++ gnome-shell-extension-ubuntu-dock-72~ubuntu5/locations.js	2022-04-14 20:24:07.000000000 +0000
@@ -811,7 +811,7 @@
 
             if (windows.length !== oldWindows.length ||
                 windows.some((win, index) => win !== oldWindows[index])) {
-                this._windows = windows;
+                this._windows = windows.filter(w => !w.is_override_redirect());
                 this.emit('windows-changed');
                 result.windowsChanged = true;
             }