diff --git a/packages/react-formio/src/components/form-edit/formEdit.reducer.ts b/packages/react-formio/src/components/form-edit/formEdit.reducer.ts
index 322460f3..77bb4b71 100644
--- a/packages/react-formio/src/components/form-edit/formEdit.reducer.ts
+++ b/packages/react-formio/src/components/form-edit/formEdit.reducer.ts
@@ -32,8 +32,8 @@ export const reducer = (
 
   const update = (newValue: any): any => {
     if (newValue.title !== state.current.title && !state.current._id) {
-      newValue.name = camelCase(value);
-      newValue.path = camelCase(value).toLowerCase();
+      newValue.name = camelCase(value.title);
+      newValue.path = camelCase(value.title).toLowerCase();
     }
 
     return {
diff --git a/packages/react-formio/src/components/form-edit/formEdit.stories.tsx b/packages/react-formio/src/components/form-edit/formEdit.stories.tsx
index ffadc1ad..bbdb860c 100644
--- a/packages/react-formio/src/components/form-edit/formEdit.stories.tsx
+++ b/packages/react-formio/src/components/form-edit/formEdit.stories.tsx
@@ -50,7 +50,6 @@ export const Sandbox = (args: any) => {
 
 Sandbox.args = {
   form: {
-    _id: "6023f8fe4b1a2ab9a3aae096",
     type: "form",
     tags: [],
     owner: "5d0797a382461b6656d2c790",
diff --git a/packages/tailwind-formio/styles/button.css b/packages/tailwind-formio/styles/button.css
index 1cce3a82..059b5a0f 100644
--- a/packages/tailwind-formio/styles/button.css
+++ b/packages/tailwind-formio/styles/button.css
@@ -158,7 +158,7 @@ fieldset:disabled a.btn {
   @apply text-gray-200 bg-transparent border-gray-100;
 
   &:not(:disabled):not(.disabled) {
-    @apply hover:text-gray-800 hover:bg-gray-300 focus:bg-gray-300 hover:border-gray-300 focus:border-gray-300 focus:text-gray-800;
+    @apply hover:text-gray-800 hover:bg-gray-300 focus:bg-gray-300 hover:border-gray-300 focus:border-gray-300 focus:text-white;
   }
 }
 
@@ -166,7 +166,7 @@ fieldset:disabled a.btn {
   @apply text-gray bg-transparent border-gray;
 
   &:not(:disabled):not(.disabled) {
-    @apply hover:text-white hover:bg-gray-800 focus:bg-gray-800 hover:border-gray-800 focus:border-gray-800 focus:text-gray-800;
+    @apply hover:text-white hover:bg-gray-800 focus:bg-gray-800 hover:border-gray-800 focus:border-gray-800 focus:text-white;
   }
 }