diff --git a/src/Text3.cpp b/src/Text3.cpp
index a4166fba9d..02aa496178 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1166,7 +1166,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		pos_type pos = cur.pos();
 		BufferParams const & bufparams = bv->buffer().params();
 		Layout const & style = par.layout();
-		if (!style.pass_thru
+		InsetLayout const & ilayout = cur.inset().getLayout(bufparams);
+		if (!style.pass_thru && !ilayout.isPassThru()
 		    && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
 			// this avoids a double undo
 			// FIXME: should not be needed, ideally
diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 7596469eed..6fc51e11d8 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -109,12 +109,6 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 	Layout const layout = bp.documentClass().plainLayout();
 	//lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
 	switch (cmd.action) {
-	case LFUN_QUOTE_INSERT: {
-		// We need to bypass the fancy quotes in Text
-		FuncRequest f(LFUN_SELF_INSERT, "\"");
-		dispatch(cur, f);
-		break;
-	}
 	case LFUN_INSET_MODIFY: {
 		setStatus(cur, string2params(to_utf8(cmd.argument())));
 		break;