diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 797f5810b..454fe266e 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -1220,12 +1220,7 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r
 		switch(itemid)
 		{
 			case CMID_TREE_LAUNCH:
-				tree_mouse_action(tree, BROWSER_MOUSE_DOUBLE_CLICK, 0, 0);
-				/**TODO: this needs fixing.                         ^^^^
-				(a) the mouse co-ordinates where the context menu was opened are not propagated and
-				(b) does a double-click here open ALL selected entries?
-				(c) what happens if the user right-clicked over a non-selected entry with others selected?
-				**/
+				tree_keypress(tree, KEY_CR);
 			break;
 
 			case CMID_TREE_EDITFOLDER: