diff --git a/src/ChangeLog b/src/ChangeLog
index 34d650509f..c018aaa201 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* lyxfunc.C  (dispatch): do not attempt to toggle math insets
+	via ALL_INSETS_TOGGLE (partially fixes bug 3358).
+
 2007-04-10  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* text3.C  (dispatch): fix undo in LFUN_QUOTE (bug 3439).
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index cde90a4b0c..2c162543c1 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1440,8 +1440,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			InsetIterator it  = inset_iterator_begin(inset);
 			InsetIterator const end = inset_iterator_end(inset);
 			for (; it != end; ++it) {
-				if (inset_code == InsetBase::NO_CODE
-				    || inset_code == it->lyxCode()) {
+				if (!it->asMathInset()
+				    && (inset_code == InsetBase::NO_CODE
+				    || inset_code == it->lyxCode())) {
 					LCursor tmpcur = cur;
 					tmpcur.pushLeft(*it);
 					it->dispatch(tmpcur, fr);