diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 9729eb53d3..a05da14874 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -122,6 +122,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		$send_value = $value;
 
 		list($app) = explode('.',$value['get_rows']);
+		if(!$GLOBALS['egw_info']['apps'][$app])
+		{
+			list($app) = explode('.',$this->attrs['template']);
+		}
 
 		// Check for a favorite in URL
 		if($_GET['favorite'] && $value['favorites'])