diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js
index 3392d5f3b..8979c6ec7 100644
--- a/core/modules/storyviews/zoomin.js
+++ b/core/modules/storyviews/zoomin.js
@@ -212,8 +212,8 @@ ZoominListView.prototype.remove = function(widget) {
 	]);
 	setTimeout(function() {
 		$tw.utils.removeStyles(toWidgetDomNode, ["transformOrigin", "transform", "transition", "opacity", "zIndex"]);
+		removeElement();
 	}, duration);	
-	setTimeout(removeElement,duration);
 	// Now the tiddler we're going back to
 	if(toWidgetDomNode) {
 		$tw.utils.setStyle(toWidgetDomNode,[
diff --git a/core/modules/utils/dom/browser.js b/core/modules/utils/dom/browser.js
index 8ae7d5f2d..b8399bbce 100644
--- a/core/modules/utils/dom/browser.js
+++ b/core/modules/utils/dom/browser.js
@@ -30,8 +30,10 @@ Remove style properties of an element
 	styleProperties: ordered array of string property names
 */
 exports.removeStyles = function(element, styleProperties) {
-	for(var i=0; i<styleProperties.length; i++) {
-		element.style.removeProperty($tw.utils.convertStyleNameToPropertyName(styleProperties[i]));
+	if(element) {
+		for(var i=0; i<styleProperties.length; i++) {
+			element.style.removeProperty($tw.utils.convertStyleNameToPropertyName(styleProperties[i]));
+		}
 	}
 };