diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 9ba98e909c3..6c1b0e614f2 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -90,6 +90,8 @@ export default {
     },
 
     beforeUnmount() {
+		Statamic.$config.set('isFormBlueprint', false);
+
         this.$events.$off('root-form-save');
 
 		this.saveKeyBinding.destroy();
diff --git a/src/Http/Controllers/CP/Forms/FormBlueprintController.php b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
index f748bcec99b..90b386b166a 100644
--- a/src/Http/Controllers/CP/Forms/FormBlueprintController.php
+++ b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
@@ -45,6 +45,7 @@ public function edit($form)
             'blueprint' => $this->toVueObject($blueprint),
             'action' => cp_route('blueprints.forms.update', $form->handle()),
             'isFormBlueprint' => true,
+            'useTabs' => false,
         ]);
     }