diff --git a/js/ui/animation.js b/js/ui/animation.js
index 5b4a10c08..65fff2cd7 100644
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -104,6 +104,11 @@ var Spinner = new Lang.Class({
         this._animate = animate;
     },
 
+    _onDestroy() {
+        this._animate = false;
+        this.parent();
+    },
+
     play() {
         Tweener.removeTweens(this.actor);