diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47da11f7..86c9ebba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Bug Fixes
 - Add handling for non-latin-1 characters in webhook headers
+- Fix dark mode bug in selectpicker widgets
 
 ## v1.22.0 - 2020-08-06
 
diff --git a/static/css/bootstrap-colors.css b/static/css/bootstrap-colors.css
index 833f2b58..71050e33 100644
--- a/static/css/bootstrap-colors.css
+++ b/static/css/bootstrap-colors.css
@@ -19,6 +19,22 @@
     border-color: var(--btn-active-border);
 }
 
+.open > .dropdown-toggle.btn-default,
+.open > .dropdown-toggle.btn-default:active,
+.open > .dropdown-toggle.btn-default:hover,
+.open > .dropdown-toggle.btn-default:focus {
+    color: var(--btn-active-color);
+    background-color: var(--btn-active-bg);
+    border-color: var(--btn-active-border);
+}
+
+.bootstrap-select > .dropdown-toggle.bs-placeholder,
+.bootstrap-select > .dropdown-toggle.bs-placeholder:active,
+.bootstrap-select > .dropdown-toggle.bs-placeholder:focus,
+.bootstrap-select > .dropdown-toggle.bs-placeholder:hover {
+    color:  var(--btn-default-color);
+}
+
 .alert-info {
     background-color: var(--state-info-bg);
     border-color: var(--state-info-border);
diff --git a/static/css/variables.css b/static/css/variables.css
index aafa3ed1..dca7337f 100644
--- a/static/css/variables.css
+++ b/static/css/variables.css
@@ -150,8 +150,3 @@ body.dark {
     --text-color: hsl(240, 3.3%, 88.2%);
     --text-muted: hsl(240, 3%, 55%);
 }
-
-
-
-
-