diff --git a/packages/core/addon/services/caluma-options.js b/packages/core/addon/services/caluma-options.js
index 1ace084f9..2ba08a910 100644
--- a/packages/core/addon/services/caluma-options.js
+++ b/packages/core/addon/services/caluma-options.js
@@ -31,8 +31,18 @@ export default class CalumaOptionsService extends Service {
       : null;
   }
 
+  /**
+   * Use number separator widget for all viable questions (integer, float and
+   * calculated float) without exceptions.
+   */
   alwaysUseNumberSeparatorWidget = false;
 
+  /**
+   * Pre-select number separator widget when creating a viable question in the
+   * form builder.
+   */
+  useNumberSeparatorWidgetAsDefault = false;
+
   /**
    * Registers a new component override.
    *
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question.hbs b/packages/form-builder/addon/components/cfb-form-editor/question.hbs
index 43c5146d4..7f369c09d 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question.hbs
+++ b/packages/form-builder/addon/components/cfb-form-editor/question.hbs
@@ -35,7 +35,7 @@
         @name="__typename"
         @required={{true}}
         @disabled={{not (is-empty @slug)}}
-        @on-update={{changeset-set f.model "__typename"}}
+        @on-update={{this.updateType}}
       />
 
       <f.input
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question.js b/packages/form-builder/addon/components/cfb-form-editor/question.js
index 19b6b7451..2c1d3f0d2 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question.js
+++ b/packages/form-builder/addon/components/cfb-form-editor/question.js
@@ -501,6 +501,30 @@ export default class CfbFormEditorQuestion extends Component {
     }
   }
 
+  @action
+  updateType(value, changeset) {
+    changeset.set("__typename", value);
+
+    const defaultWidget = "cf-field/input/number-separator";
+    const currentWidget = changeset.get("meta.widgetOverride");
+    const isViableType = [
+      "IntegerQuestion",
+      "FloatQuestion",
+      "CalculatedFloatQuestion",
+    ].includes(value);
+
+    if (this.calumaOptions.useNumberSeparatorWidgetAsDefault) {
+      if (isViableType && !currentWidget) {
+        // Set the default widget as override if the question type is viable for
+        // it and there is no widget selected yet
+        changeset.set("meta.widgetOverride", defaultWidget);
+      } else if (!isViableType && currentWidget === defaultWidget) {
+        // Remove default widget for non viable question types
+        changeset.set("meta.widgetOverride", undefined);
+      }
+    }
+  }
+
   @action
   updateSubForm(value, changeset) {
     changeset.set("subForm.slug", value.slug);