diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 39b119586b..ce8e4d5bc0 100644
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -463,8 +463,8 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
 		case LFUN_MATH_DISPLAY:
 		{
-			int x;
-			int y;
+			int x = 0;
+			int y = 0;
 			mathcursor->getPos(x, y);
 			if (mat()->getType() == LM_OT_SIMPLE)
 				mat()->mutate(LM_OT_EQUATION);
@@ -491,6 +491,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 			mat()->addCol(mat()->ncols());
 			mathcursor->normalize();
 			updateLocal(bv, true);
+			break;
 		}
 
 		default:
diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 02ecf16837..41bb90666b 100644
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -418,10 +418,10 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 		bv->updateInset(this, true);
 		break;
 
-		//    case LFUN_GETXY:
-		//      sprintf(dispatch_buffer, "%d %d",);
-		//      dispatch_result = dispatch_buffer;
-		//      break;
+	//    case LFUN_GETXY:
+	//      sprintf(dispatch_buffer, "%d %d",);
+	//      dispatch_result = dispatch_buffer;
+	//      break;
 	case LFUN_SETXY: {
 		lyxerr << "LFUN_SETXY broken!\n";
 		int x = 0;
@@ -611,12 +611,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 	}
 
 	lyx::Assert(mathcursor);
-	//mathcursor->normalize();
 
-	if (//was_macro != mathcursor->inMacroMode() &&
-				action >= 0 && action != LFUN_BACKSPACE) 
-  		updateLocal(bv, true);
-	
 	if (mathcursor->selection() || was_selection)
 		toggleInsetSelection(bv);