diff --git a/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
index bd94da743d..e56321bc4a 100644
--- a/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
@@ -1958,7 +1958,9 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
     }
 
     _clearPrevSelection(actor) {
-        if (this._previousSelectedActor && this._previousSelectedActor != actor) {
+        if (this._previousSelectedActor
+            && !this._previousSelectedActor.is_finalized()
+            && this._previousSelectedActor != actor) {
             if (this._previousSelectedActor._delegate instanceof ApplicationButton ||
                 this._previousSelectedActor._delegate instanceof RecentButton ||
                 this._previousSelectedActor._delegate instanceof SearchProviderResultButton ||
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 868e461951..fe30da3be0 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -511,7 +511,7 @@ var _Draggable = new Lang.Class({
                                                 event.get_time())) {
                     // If it accepted the drop without taking the actor,
                     // handle it ourselves.
-                    if (this._dragActor.get_parent() == Main.uiGroup) {
+                    if (!this._dragActor.is_finalized() && this._dragActor.get_parent() === Main.uiGroup) {
                         if (this._restoreOnSuccess) {
                             this._restoreDragActor(event.get_time());
                             return true;
diff --git a/js/ui/overview.js b/js/ui/overview.js
index f35a85767b..9493d9939c 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -15,7 +15,7 @@ const Tweener = imports.ui.tweener;
 const WorkspacesView = imports.ui.workspacesView;
 
 // Time for initial animation going into Overview mode
-const ANIMATION_TIME = 0.25;
+var ANIMATION_TIME = 0.25;
 
 const SwipeScrollDirection = WorkspacesView.SwipeScrollDirection;
 
diff --git a/js/ui/tooltips.js b/js/ui/tooltips.js
index 4d82687644..aa6bff5afd 100644
--- a/js/ui/tooltips.js
+++ b/js/ui/tooltips.js
@@ -207,6 +207,7 @@ Tooltip.prototype = {
     },
 
     hide: function() {
+        if (this._tooltip.is_finalized()) return;
         this._tooltip.hide();
 
         this.visible = false;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index b691988477..2322e4ba0c 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1120,7 +1120,7 @@ WorkspaceMonitor.prototype = {
     },
 
     showWindowsOverlays: function() {
-        if (this.leavingOverview)
+        if (this.leavingOverview || this._windowOverlaysGroup.is_finalized())
             return;
 
         this._windowOverlaysGroup.show();
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 75a7ef6de2..0adf108a0d 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -203,7 +203,7 @@ WorkspacesView.prototype = {
                         });
                 }
                 Tweener.addTween(workspace.actor, params);
-            } else {
+            } else if (!workspace.actor.is_finalized()) {
                 workspace.actor.set_position(x, 0);
                 if (w == 0)
                     this._updateVisibility();
@@ -219,7 +219,7 @@ WorkspacesView.prototype = {
             if (this._animating || this._scrolling) {
                 workspace.hideWindowsOverlays();
                 workspace.actor.show();
-            } else {
+            } else if (!workspace.actor.is_finalized()) {
                 workspace.showWindowsOverlays();
                 workspace.actor.visible = (w == active);
             }