diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
index c7c081230ff3..3cdbfa31d8ca 100644
--- a/libmscore/edit.cpp
+++ b/libmscore/edit.cpp
@@ -4565,7 +4565,8 @@ void Score::undoAddElement(Element* element)
          && et != ElementType::TREMOLOBAR
          && et != ElementType::FRET_DIAGRAM
          && et != ElementType::FERMATA
-         && et != ElementType::HARMONY)
+         && et != ElementType::HARMONY
+         && et != ElementType::FIGURED_BASS)
             ) {
             undo(new AddElement(element));
             return;
@@ -4741,7 +4742,8 @@ void Score::undoAddElement(Element* element)
                      || element->isSticking()
                      || element->isFretDiagram()
                      || element->isFermata()
-                     || element->isHarmony()) {
+                     || element->isHarmony()
+                     || element->isFiguredBass()) {
                         Segment* segment = element->parent()->isFretDiagram() ? toSegment(element->parent()->parent()) : toSegment(element->parent());
                         Fraction tick    = segment->tick();
                         Measure* m       = score->tick2measure(tick);
diff --git a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp
index f134eae73629..2006f4c9a1d1 100644
--- a/libmscore/figuredbass.cpp
+++ b/libmscore/figuredbass.cpp
@@ -1768,7 +1768,7 @@ FiguredBass* Score::addFiguredBass()
             }
 
       FiguredBass * fb;
-      bool bNew;
+      bool bNew = true;
       if (el->isNote()) {
             ChordRest * cr = toNote(el)->chord();
             fb = FiguredBass::addFiguredBassToSegment(cr->segment(), cr->staffIdx() * VOICES, Fraction(0,1), &bNew);