diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1d2f8b6396..845582650d 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1389,11 +1389,17 @@ windowcontrols {
 
     @extend %button_basic_flat;
 
+
     border-radius: 9999px;
     padding: 6px;
     margin: 0 2px;
     min-width: 0;
     min-height: 0;
+    &:hover {
+      //special case hover colors inside a headerbar
+      @include button(undecorated-hover,$c:$headerbar_bg_color);
+    }
+    &:active { @include button(undecorated-active,$c:$headerbar_bg_color); }
   }
 }