diff --git a/src/uimenu.cpp b/src/uimenu.cpp
index 51344d9..5ba7c04 100644
--- a/src/uimenu.cpp
+++ b/src/uimenu.cpp
@@ -393,6 +393,11 @@ void CUIMenu::EditGlobalParameter (CUIMenu *pUIMenu, TMenuEvent Event)
 		}
 		pUIMenu->m_pMiniDexed->SetParameter (Param, nValue);
 		break;
+		
+	case MenuEventSelect:
+		// when a parameter is selected --> accept change and return one level up
+		pUIMenu->EventHandler( CUIMenu::MenuEventBack );
+		return;
 
 	default:
 		return;
@@ -444,6 +449,11 @@ void CUIMenu::EditVoiceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event)
 		pUIMenu->TGShortcutHandler (Event);
 		return;
 
+	case MenuEventSelect:
+		// when a parameter is selected --> accept change and return one level up
+		pUIMenu->EventHandler( CUIMenu::MenuEventBack );
+		return;
+
 	default:
 		return;
 	}
@@ -492,6 +502,11 @@ void CUIMenu::EditProgramNumber (CUIMenu *pUIMenu, TMenuEvent Event)
 		pUIMenu->TGShortcutHandler (Event);
 		return;
 
+	case MenuEventSelect:
+		// when a parameter is selected --> accept change and return one level up
+		pUIMenu->EventHandler( CUIMenu::MenuEventBack );
+		return;
+
 	default:
 		return;
 	}
@@ -544,6 +559,11 @@ void CUIMenu::EditTGParameter (CUIMenu *pUIMenu, TMenuEvent Event)
 		pUIMenu->TGShortcutHandler (Event);
 		return;
 
+	case MenuEventSelect:
+		// when a parameter is selected --> accept change and return one level up
+		pUIMenu->EventHandler( CUIMenu::MenuEventBack );
+		return;
+
 	default:
 		return;
 	}
@@ -649,6 +669,11 @@ void CUIMenu::EditOPParameter (CUIMenu *pUIMenu, TMenuEvent Event)
 		pUIMenu->OPShortcutHandler (Event);
 		return;
 
+	case MenuEventSelect:
+		// when a parameter is selected --> accept change and return one level up
+		pUIMenu->EventHandler( CUIMenu::MenuEventBack );
+		return;
+
 	default:
 		return;
 	}
diff --git a/src/userinterface.cpp b/src/userinterface.cpp
index 0fbf440..1999b20 100644
--- a/src/userinterface.cpp
+++ b/src/userinterface.cpp
@@ -197,11 +197,13 @@ void CUserInterface::EncoderEventHandler (CKY040::TEvent Event)
 		break;
 
 	case CKY040::EventSwitchClick:
-		m_Menu.EventHandler (CUIMenu::MenuEventBack);
+		// m_Menu.EventHandler (CUIMenu::MenuEventBack);
+		m_Menu.EventHandler (CUIMenu::MenuEventSelect);
 		break;
 
 	case CKY040::EventSwitchDoubleClick:
-		m_Menu.EventHandler (CUIMenu::MenuEventSelect);
+		// m_Menu.EventHandler (CUIMenu::MenuEventSelect);
+		m_Menu.EventHandler (CUIMenu::MenuEventBack);
 		break;
 
 	case CKY040::EventSwitchTripleClick: