diff -Nru gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/changelog gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/changelog
--- gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/changelog	2020-09-10 12:36:24.000000000 +0800
+++ gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/changelog	2020-12-08 15:14:49.000000000 +0800
@@ -1,3 +1,12 @@
+gnome-shell-extension-desktop-icons (20.04.0+git20200908-1ubuntu1) groovy; urgency=medium
+
+  * Add desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch
+    to fix crashes in st_bin_destroy (LP: #1898005).
+  * Add desktopManager-Allocate-the-draggable-actor-before-starti.patch
+    to fix broken drag-and-drop (LP: #1898462).
+
+ -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Tue, 08 Dec 2020 15:14:49 +0800
+
 gnome-shell-extension-desktop-icons (20.04.0+git20200908-1) experimental; urgency=medium
 
   * New upstream git snapshot:
diff -Nru gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Allocate-the-draggable-actor-before-starti.patch gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Allocate-the-draggable-actor-before-starti.patch
--- gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Allocate-the-draggable-actor-before-starti.patch	1970-01-01 08:00:00.000000000 +0800
+++ gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Allocate-the-draggable-actor-before-starti.patch	2020-12-08 15:13:00.000000000 +0800
@@ -0,0 +1,28 @@
+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Date: Mon, 7 Dec 2020 18:09:05 +0000
+Subject: desktopManager: Allocate the draggable actor before starting the
+ drag
+
+Origin: https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/-/merge_requests/193
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1898462
+Forwarded: yes
+Last-Update: 2020-12-07
+---
+ desktopManager.js | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/desktopManager.js b/desktopManager.js
+index 7d4b562..1aad8c6 100644
+--- a/desktopManager.js
++++ b/desktopManager.js
+@@ -504,6 +504,10 @@ var DesktopManager = GObject.registerClass({
+         }
+ 
+         Main.layoutManager.uiGroup.add_child(this._draggableContainer);
++
++        if (this._draggableContainer.get_fixed_position !== undefined)
++            this._draggableContainer.allocate_preferred_size(0, 0);
++
+         this._draggable.startDrag(x, y, global.get_current_time(), event.get_event_sequence());
+     }
+ 
diff -Nru gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch
--- gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch	1970-01-01 08:00:00.000000000 +0800
+++ gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch	2020-12-08 15:13:00.000000000 +0800
@@ -0,0 +1,26 @@
+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Date: Mon, 7 Dec 2020 18:09:05 +0000
+Subject: desktopManager: Avoid scheduling multiple _layoutChildren idlers
+
+Origin: https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/-/merge_requests/191
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1898005
+Forwarded: yes
+Last-Update: 2020-11-27
+---
+ desktopManager.js | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/desktopManager.js b/desktopManager.js
+index 392220d..7d4b562 100644
+--- a/desktopManager.js
++++ b/desktopManager.js
+@@ -651,7 +651,8 @@ var DesktopManager = GObject.registerClass({
+ 
+         Object.values(this._desktopGrids).forEach((grid) => grid.reset());
+ 
+-        this._layoutChildrenId = GLib.idle_add(GLib.PRIORITY_LOW, () => this._layoutChildren());
++        if (!this._layoutChildrenId)
++            this._layoutChildrenId = GLib.idle_add(GLib.PRIORITY_LOW, () => this._layoutChildren());
+ 
+         return GLib.SOURCE_REMOVE;
+     }
diff -Nru gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/series gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/series
--- gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/series	2020-09-10 12:36:24.000000000 +0800
+++ gnome-shell-extension-desktop-icons-20.04.0+git20200908/debian/patches/series	2020-12-08 15:13:22.000000000 +0800
@@ -2,3 +2,5 @@
 desktopManager-Use-Shell-s-native-switcheroo-controller.patch
 createFolderDialog-Port-to-use-new-shell-dialog-APIs.patch
 metadata-Bump-dependency-on-gnome-shell-3.38.patch
+desktopManager-Avoid-scheduling-multiple-_layoutChildren-.patch
+desktopManager-Allocate-the-draggable-actor-before-starti.patch