diff --git a/packages/console/app/src/routes/workspace/[id]/provider-section.module.css b/packages/console/app/src/routes/workspace/[id]/provider-section.module.css
index b693de77..1a450d3d 100644
--- a/packages/console/app/src/routes/workspace/[id]/provider-section.module.css
+++ b/packages/console/app/src/routes/workspace/[id]/provider-section.module.css
@@ -18,6 +18,14 @@
       font-weight: normal;
       color: var(--color-text-muted);
       text-transform: uppercase;
+
+      &:nth-child(1) {
+        width: 180px;
+      }
+
+      &:nth-child(3) {
+        width: 200px;
+      }
     }
 
     td {
@@ -35,7 +43,6 @@
       &[data-slot="provider-key"] {
         text-align: left;
         color: var(--color-text-secondary);
-        width: 50%;
 
         [data-slot="edit-form"] {
           display: flex;
@@ -82,7 +89,6 @@
       &[data-slot="provider-action"] {
         text-align: left;
         font-family: var(--font-sans);
-        width: 30%;
         white-space: nowrap;
 
         [data-slot="configured-actions"] {
diff --git a/packages/console/app/src/routes/workspace/[id]/provider-section.tsx b/packages/console/app/src/routes/workspace/[id]/provider-section.tsx
index b83fd263..6ec8477b 100644
--- a/packages/console/app/src/routes/workspace/[id]/provider-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/provider-section.tsx
@@ -147,9 +147,11 @@ function ProviderRow(props: { provider: Provider }) {
             >
               {saveSubmission.pending ? "Saving..." : "Save"}
             </button>
-            <button type="reset" data-color="ghost" onClick={() => hide()}>
-              Cancel
-            </button>
+            <Show when={!saveSubmission.pending}>
+              <button type="reset" data-color="ghost" onClick={() => hide()}>
+                Cancel
+              </button>
+            </Show>
           </div>
         </Show>
       </td>