diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 17610e08579..6ce2d968dd6 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2609,10 +2609,14 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent)
 				if(count==act) {
 					but->flag |= UI_ACTIVE;
 					if(uevent->val==1) ui_draw_but(but);
-					else {
+					else if(block->flag & UI_BLOCK_RET_1) { /* to make UI_BLOCK_RET_1 working */
 						uevent->event= RETKEY;
-						uevent->val= 1;			/* patch: to avoid UI_BLOCK_RET_1 type not working */
-						addqueue(block->winq, RIGHTARROWKEY, 1);
+						uevent->val= 1;			
+						//addqueue(block->winq, RIGHTARROWKEY, 1); (why! (ton))
+					}
+					else { 
+						uevent->event= LEFTMOUSE;	/* to make sure the button is handled further on */
+						uevent->val= 1;			
 					}
 				}
 				else if(but->flag & UI_ACTIVE) {
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index 25e7a5a961d..bff97796e79 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -1228,7 +1228,7 @@ int movetolayer_buts(unsigned int *lay)
 	y1= pivot[1]-sizey/2; 
 
 	block= uiNewBlock(&listb, "button", UI_EMBOSS, UI_HELV, G.curscreen->mainwin);
-	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT|UI_BLOCK_RET_1);
+	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT|UI_BLOCK_ENTER_OK);
 	
 	dx= (sizex-5)/12;
 	dy= sizey/2;