diff --git a/ui/admin/app/components/form/storage-bucket/aws/index.hbs b/ui/admin/app/components/form/storage-bucket/aws/index.hbs
index 838f4f9c4..473eca93a 100644
--- a/ui/admin/app/components/form/storage-bucket/aws/index.hbs
+++ b/ui/admin/app/components/form/storage-bucket/aws/index.hbs
@@ -472,7 +472,7 @@
         </Hds::Link::Inline>
       </F.HelperText>
       <F.Control>
-        {{#if form.disabled}}
+        {{#if (and form.disabled (not @model.isSaving))}}
           <Hds::CodeBlock
             @language='bash'
             @value={{@model.worker_filter}}
diff --git a/ui/admin/app/components/form/storage-bucket/minio/index.hbs b/ui/admin/app/components/form/storage-bucket/minio/index.hbs
index 76c7ca069..ad298c3cb 100644
--- a/ui/admin/app/components/form/storage-bucket/minio/index.hbs
+++ b/ui/admin/app/components/form/storage-bucket/minio/index.hbs
@@ -331,7 +331,7 @@
         </Hds::Link::Inline>
       </F.HelperText>
       <F.Control>
-        {{#if form.disabled}}
+        {{#if (and form.disabled (not @model.isSaving))}}
           <Hds::CodeBlock
             @maxHeight='300px'
             @language='bash'