diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 84d5b7fa56..6917fb7fb5 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -2016,7 +2016,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
 	 *	additional fields/settings to add in to the favorite.
 	 */
 	_setup_favorites: function(filters) {
-		if(typeof filters == "undefined")
+		if(typeof filters == "undefined" || filters === false)
 		{
 			// No favorites configured
 			return;
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 2224cd9697..05da7fb101 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -820,8 +820,16 @@ class infolog_ui
 		//apply infolog_filter2_change javascript method (show/hide details each rows) over onchange filter2
 		$values['nm']['filter2_onchange'] = "app.infolog.filter2_change();";
 
-		// Allow saving parent ID into favorites
-		$values['nm']['favorites'] = array('action','action_id');
+		// disable favories dropdown button, if not running as infolog
+		if ($called_as && $called_as != 'infolog')
+		{
+			$values['nm']['favorites'] = false;
+		}
+		else
+		{
+			// Allow saving parent ID into favorites
+			$values['nm']['favorites'] = array('action','action_id');
+		}
 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 0a78c9b870..d4e029d9cb 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package infolog
  * @version $Id$
  */
-/* $Id: app.css 45124 2014-01-14 13:48:11Z nathangray $ */
+/* $Id$ */
 .infolog_headertext {
   color: black;
   font-size: 120%;