diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index cf5a701629..f6888743be 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2221,13 +2221,10 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
 	
 	// set update flags
 	if (changed) {
-		//lyxerr << "inlineCompletion changed" << std::endl;
-		
-		Update::flags flags
-		= cur.disp_.update() | Update::Force;
-		if (singlePar && !(flags | Update::SinglePar))
-		    flags = flags | Update::SinglePar;
-		cur.updateFlags(flags);
+		if (singlePar && !(cur.disp_.update() | Update::Force))
+			cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+		else
+			cur.updateFlags(cur.disp_.update() | Update::Force);
 	}
 }
 
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 647ccef417..b6062d3500 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -547,7 +547,7 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s,
 	cur.insert(s);
 	cur.bv().cursor() = cur;
 	if (!(cur.disp_.update() & Update::Force))
-		cur.updateFlags(cur.disp_.update() | Update::Force | Update::SinglePar);
+		cur.updateFlags(cur.disp_.update() | Update::SinglePar);
 	return true;
 }
 
diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index b86d36ca6b..6955de032f 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -804,7 +804,7 @@ bool MathMacro::insertCompletion(Cursor & cur, docstring const & s,
 	if (finished) {
 		cur.bv().cursor().pop();
 		++cur.bv().cursor().pos();
-		cur.updateFlags(Update::Force | Update::SinglePar);
+		cur.updateFlags(Update::SinglePar);
 	}
 	
 	return true;