diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index a1bb1334d3..2361314741 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -994,7 +994,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
 		this.egw().set_preference(app, pref, colDisplay.join(","),
 			// Use callback after the preference gets set to trigger refresh, in case app
 			// isn't looking at selectcols and just uses preference
-			cf_added ? jQuery.proxy(function() {this.controller.update(true);}, this):null
+			cf_added ? jQuery.proxy(function() {if(this.controller) this.controller.update(true);}, this):null
 		);
 
 		// Save adjusted column sizes
diff --git a/infolog/js/app.js b/infolog/js/app.js
index 3e6b3c820c..df000063ad 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -59,6 +59,8 @@ app.classes.infolog = AppJS.extend(
 				var nm = this.et2.getWidgetById('nm');
 				var filter2 = nm.getWidgetById('filter2');
 				this.show_details(filter2.value == 'all',nm.getDOMNode(nm));
+				// Remove the rule added by show_details() if the template is removed
+				$j(_et2.DOMContainer).on('clear', function() {egw.css('#infolog-index_nm .et2_box.infoDes');});
 
 				// Enable decrypt on hover
 				if(this.egw.user('apps').stylite)