diff --git a/ui/core/app/components/form/project/index.hbs b/ui/core/app/components/form/project/index.hbs
index 3842fc226..7541f8ed5 100644
--- a/ui/core/app/components/form/project/index.hbs
+++ b/ui/core/app/components/form/project/index.hbs
@@ -1,44 +1,30 @@
-<form
-  ...attributes
-  novalidate
-  method="post"
-  {{on "submit" @submit}}>
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  as |form|
+>
 
-  <Rose::Form::Input
+  <form.input
     name="name"
     @type="name"
     @value={{@model.name}}
     @label={{t "form.label.name"}}
     @error={{false}}
-    disabled={{@model.isSaving}}
-    readonly={{false}}
-  />
+    readonly={{false}} />
 
-  <Rose::Form::Textarea
+  <form.textarea
     name="description"
     @type="description"
     @value={{@model.description}}
     @label={{t "form.label.description"}}
     @error={{false}}
     disabled={{@model.isSaving}}
-    readonly={{false}}
-  />
+    readonly={{false}} />
 
-  <section class="form-actions">
-    <Rose::Button
-      @disabled={{@model.cannotSave}}
-      @submit={{true}}
-      @style="primary"
-    >
-      {{t 'actions.save'}}
-    </Rose::Button>
+  <form.actions
+    @disabled={{if @model.cannotSave @model.cannotSave}}
+    @submitText={{t "actions.save"}}
+    @cancelText={{t "actions.cancel"}} />
 
-    <Rose::Button
-      @disabled={{@model.cannotSave}}
-      @style="secondary"
-      {{on "click" @cancel}}
-    >
-      {{t 'actions.cancel'}}
-    </Rose::Button>
-  </section>
-</form>
+</Rose::Form>
diff --git a/ui/core/app/routes/orgs/org/projects/new.js b/ui/core/app/routes/orgs/org/projects/new.js
index d8ffa28ae..15402927d 100644
--- a/ui/core/app/routes/orgs/org/projects/new.js
+++ b/ui/core/app/routes/orgs/org/projects/new.js
@@ -31,9 +31,7 @@ export default class OrgsOrgProjectsNewRoute extends Route {
    * @param {Event} e
    */
   @action
-  async save(project, e) {
-    // Prevent default behavior, since this was trigger from a form submission.
-    e.preventDefault();
+  async save(project) {
     try {
       await project.save();
       this.transitionTo('orgs.org.projects.project', project);
diff --git a/ui/core/app/routes/orgs/org/projects/project.js b/ui/core/app/routes/orgs/org/projects/project.js
index 5441e1aaa..8fa788bd3 100644
--- a/ui/core/app/routes/orgs/org/projects/project.js
+++ b/ui/core/app/routes/orgs/org/projects/project.js
@@ -44,9 +44,7 @@ export default class OrgsOrgProjectsProjectRoute extends Route {
    * @param {Event} e
    */
   @action
-  async save(project, e) {
-    // Prevent default behavior, since this was trigger from a form submission.
-    e.preventDefault();
+  async save(project) {
     try {
       await project.save();
     } catch (e) {