diff --git a/etemplate/js/et2_extension_nextmatch_actions.js b/etemplate/js/et2_extension_nextmatch_actions.js
index 99d9979f9c..00f70caf2d 100644
--- a/etemplate/js/et2_extension_nextmatch_actions.js
+++ b/etemplate/js/et2_extension_nextmatch_actions.js
@@ -151,12 +151,16 @@ function nm_action(_action, _senders, _target, _ids)
 
 				if(_action.data.nm_action == 'open_popup')
 				{
+					// Force nextmatch to re-load affected rows
+					for(var i = 0; i < idsArr.length; i++)
+					{
+						nextmatch.egw().dataStoreUID(nextmatch.egw().appName +'::'+idsArr[i],false);
+					}
+
 					nextmatch.getInstanceManager().submit();
 
 					// Clear action in case there's another one
 					delete nextmatch.getValue;
-
-					// TODO: force nextmatch to re-load affected rows
 				}
 				else
 				{
diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index e227e5c23a..224261408b 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -373,7 +373,7 @@ egw.extend("data_storage", egw.MODULE_GLOBAL, function (_app, _wnd) {
 			for (var key in localStorage)
 			{
 				var parts = key.split("::");
-				if (parts[0] === _prefix)
+				if (parts[0] === _prefix && localStorage[key].data)
 				{
 					result.push(parts[1]);
 				}