diff --git a/src/public/stylesheets/theme-next-dark.css b/src/public/stylesheets/theme-next-dark.css
index f441a251b..3a921d874 100644
--- a/src/public/stylesheets/theme-next-dark.css
+++ b/src/public/stylesheets/theme-next-dark.css
@@ -26,6 +26,7 @@
     --cmd-button-hover-background-color: #ffffff37;
     --cmd-button-hover-text-color: white;
     --cmd-button-shadow-color: #00000080;
+    --cmd-button-disabled-opacity: .5;
 
     --muted-text-color: #bbb;
 
diff --git a/src/public/stylesheets/theme-next-light.css b/src/public/stylesheets/theme-next-light.css
index bcb4522b3..61a7f32ad 100644
--- a/src/public/stylesheets/theme-next-light.css
+++ b/src/public/stylesheets/theme-next-light.css
@@ -26,6 +26,7 @@
     --cmd-button-hover-background-color: #00000016;
     --cmd-button-hover-text-color: #000;
     --cmd-button-shadow-color: #00000040;
+    --cmd-button-disabled-opacity: .5;
 
     --muted-text-color: #666;
 
diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index ba2d32078..a5347d0b0 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -40,6 +40,13 @@ button.btn.btn-success:active {
     transform: scale(.95);
 }
 
+button.btn.btn-primary:disabled,
+button.btn.btn-secondary:disabled,
+button.btn.btn-sm:disabled,
+button.btn.btn-success:disabled {
+    opacity: var(--cmd-button-disabled-opacity);
+}
+
 button.btn + button.btn {
     margin-left: 8px;
 }