diff --git a/src/Text2.cpp b/src/Text2.cpp
index 5f4ca2f4e9..8adc02c7b5 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -616,6 +616,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 	if (!front)
 		--cur.pos();
 	inset->edit(cur, front);
+	cur.setCurrentFont();
 	return true;
 }
 
@@ -634,6 +635,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo
 		return false;
 	inset->edit(cur, movingForward, 
 		movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT);
+	cur.setCurrentFont();
 	return true;
 }
 
diff --git a/status.21x b/status.21x
index b1b724d6bd..38387e4f9d 100644
--- a/status.21x
+++ b/status.21x
@@ -184,6 +184,9 @@ What's new
 
 - Fix cursor font after undoing a font-changing command (bug 9537).
 
+- Reset cursor font when entring an inset with char-forward/backward
+  (bug 9597).
+
 - Fix crash when attempting to restore a document with multiple views on the
   Mac (bug 9483).