diff --git a/js/ui/background.js b/js/ui/background.js
index 2dbde4ade..0e9c3aa95 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -126,6 +126,11 @@ const BackgroundCache = new Lang.Class({
     },
 
     removeImageContent: function(content) {
+        let filename = content.get_filename();
+
+        if (filename && this._fileMonitors[filename])
+            delete this._fileMonitors[filename];
+
         this._removeContent(this._images, content);
     },