diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 511b0cf7b..925d95011 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -377,7 +377,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			break;
 		case SNeutrinoSettings::ITEM_ADZAP:
 			keyhelper.get(&key,&icon,CRCInput::RC_blue);
-			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, neutrino, "adzap", key, icon);
+			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
 			break;
 #if 0
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 7239ff10c..9c9a54919 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4003,13 +4003,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
 			exit(1);
 		}
 	}
-	else if(actionKey == "adzap") {
-		CAdZapMenu::getInstance()->exec(parent, "adzap");
-		if (CAdZapMenu::getInstance()->isActive())
-			return menu_return::RETURN_EXIT_ALL;
-		else
-			return menu_return::RETURN_REPAINT;
-	}
 	else if(actionKey == "moviedir") {
 		parent->hide();