diff --git a/mscore/editelement.cpp b/mscore/editelement.cpp
index a6faa73a59fe..4e35d0cbfb99 100644
--- a/mscore/editelement.cpp
+++ b/mscore/editelement.cpp
@@ -101,13 +101,13 @@ void ScoreView::endEdit()
             harmonyEndEdit();
       else if (tp == Element::Type::FIGURED_BASS)
             figuredBassEndEdit();
-
-      if (editObject->isText()) {
+      else if (editObject->isText()) {
             Text* text = static_cast<Text*>(editObject);
             if (text->isEmpty())
                   _score->undoRemoveElement(text);
             editObject = nullptr;
             }
+
       _score->endCmd();
       mscore->endCmd();