diff --git a/src/ChangeLog b/src/ChangeLog
index c018aaa201..ab476a983c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-14  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* lyxfunc.C  (dispatch): assure math and tabular insets are 
+	really not toggled via ALL_INSETS_TOGGLE (fixes bug 3358).
+
 2007-05-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* lyxfunc.C  (dispatch): do not attempt to toggle math insets
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2c162543c1..9840fb6019 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1441,11 +1441,13 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			InsetIterator const end = inset_iterator_end(inset);
 			for (; it != end; ++it) {
 				if (!it->asMathInset()
+				    && it->lyxCode() != InsetBase::TABULAR_CODE
 				    && (inset_code == InsetBase::NO_CODE
 				    || inset_code == it->lyxCode())) {
 					LCursor tmpcur = cur;
 					tmpcur.pushLeft(*it);
-					it->dispatch(tmpcur, fr);
+					if (!tmpcur.inset().asMathInset())
+						it->dispatch(tmpcur, fr);
 				}
 			}
 			update = true;