diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index c7f681edbd..dab5740307 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3434,10 +3434,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 				&& cur.pos() == cur.lastpos())
 				|| (!next_cell && cur.pit() == 0 && cur.pos() == 0));
 
+			bool const empty_cell = cur.lastpos() == 0 && cur.lastpit() == 0;
+
 			// ...try to dispatch to the cell's inset.
 			cell(cur.idx())->dispatch(cur, cmd);
-
-			bool const empty_cell = cur.lastpos() == 0 && cur.lastpit() == 0;
 			
 			// When we already have a selection we want to select the whole cell
 			// before going to the next cell.
diff --git a/status.16x b/status.16x
index 5b42faa3a2..ac03e6d578 100644
--- a/status.16x
+++ b/status.16x
@@ -209,6 +209,8 @@ What's new
   
 - Fix a crash when performing instant preview on an uncodable character
   (bug 6116).
+  
+- Fix a crash when navigating in a table with math insets (bug 6158).
 
 - Fix communication between lyxclient and server, which leads to a
   crash once CTRL+D is used on the client side (bug 6106).