diff --git a/src/app/qgsmaptooladdregularpolygon.cpp b/src/app/qgsmaptooladdregularpolygon.cpp
index cb69130925c..35a32414534 100644
--- a/src/app/qgsmaptooladdregularpolygon.cpp
+++ b/src/app/qgsmaptooladdregularpolygon.cpp
@@ -22,6 +22,7 @@
 #include "qgspoint.h"
 #include "qgisapp.h"
 #include "qgsstatusbar.h"
+#include "qgsspinbox.h"
 
 QgsMapToolAddRegularPolygon::QgsMapToolAddRegularPolygon( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
@@ -38,7 +39,7 @@ QgsMapToolAddRegularPolygon::~QgsMapToolAddRegularPolygon()
 void QgsMapToolAddRegularPolygon::createNumberSidesSpinBox()
 {
   deleteNumberSidesSpinBox();
-  mNumberSidesSpinBox = std::unique_ptr<QSpinBox>( new QSpinBox() );
+  mNumberSidesSpinBox = std::unique_ptr<QgsSpinBox>( new QgsSpinBox() );
   mNumberSidesSpinBox->setMaximum( 99999999 );
   mNumberSidesSpinBox->setMinimum( 3 );
   mNumberSidesSpinBox->setPrefix( tr( "Number of sides: " ) );
@@ -51,7 +52,6 @@ void QgsMapToolAddRegularPolygon::deleteNumberSidesSpinBox()
 {
   if ( mNumberSidesSpinBox )
   {
-    QgisApp::instance()->statusBarIface()->removeWidget( mNumberSidesSpinBox.get() );
     mNumberSidesSpinBox.reset( nullptr );
   }
 }
diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
index e12fdea607e..2128e63c11a 100644
--- a/src/app/qgsmaptooladdregularpolygon.h
+++ b/src/app/qgsmaptooladdregularpolygon.h
@@ -41,7 +41,7 @@ class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
     explicit QgsMapToolAddRegularPolygon( QgsMapCanvas *canvas ) = delete; //forbidden
 
     std::unique_ptr<QSpinBox> mNumberSidesSpinBox;
-    int mNumberSides;
+    int mNumberSides = 6;
 
     //! (re-)create the spin box to enter the number of sides
     void createNumberSidesSpinBox();