diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 4e029097e8..61e13dfe8c 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -1405,8 +1405,18 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
 		}
 		if (s == "valign-top" || s == "valign-middle" ||
 		    s == "valign-bottom" || s == "align-left" ||
-		    s == "align-right" || s == "align-center" ||
-		    s == "append-row" || s == "delete-row" ||
+		    s == "align-right" || s == "align-center") {
+			status.setEnabled(true);
+			char const ha = horizontalAlignment(cur.col());
+			char const va = verticalAlignment();
+			status.setOnOff((s == "align-left" && ha == 'l')
+					|| (s == "align-right"   && ha == 'r')
+					|| (s == "align-center"  && ha == 'c')
+					|| (s == "valign-top"    && va == 't')
+					|| (s == "valign-bottom" && va == 'b')
+					|| (s == "valign-middle" && va == 'm'));
+		}
+		if (s == "append-row" || s == "delete-row" ||
 		    s == "copy-row" || s == "swap-row" ||
 		    s == "add-hline-above" || s == "add-hline-below" ||
 		    s == "delete-hline-above" || s == "delete-hline-below" ||
@@ -1421,15 +1431,6 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
 				from_utf8(N_("Unknown tabular feature '%1$s'")), lyx::from_ascii(s)));
 		}
 
-		char const ha = horizontalAlignment(cur.col());
-		char const va = verticalAlignment();
-		status.setOnOff((s == "align-left" && ha == 'l')
-			   || (s == "align-right"   && ha == 'r')
-			   || (s == "align-center"  && ha == 'c')
-			   || (s == "valign-top"    && va == 't')
-			   || (s == "valign-bottom" && va == 'b')
-			   || (s == "valign-middle" && va == 'm'));
-
 #if 0
 		// FIXME: What did this code do?
 		// Please check whether it is still needed!