diff --git a/src/status_menu.rs b/src/status_menu.rs
index 78c14fd3..cda8a0fa 100644
--- a/src/status_menu.rs
+++ b/src/status_menu.rs
@@ -44,6 +44,7 @@ impl ObjectImpl for StatusMenuInner {
         let menu_button = cascade! {
             gtk4::MenuButton::new();
             ..set_parent(obj);
+            ..set_has_frame(false);
             ..set_popover(Some(&cascade! {
                 gtk4::Popover::new();
                 ..set_child(Some(&vbox));
diff --git a/src/time_button.rs b/src/time_button.rs
index ed542adb..0bb26cbd 100644
--- a/src/time_button.rs
+++ b/src/time_button.rs
@@ -34,6 +34,7 @@ impl ObjectImpl for TimeButtonInner {
         let menu_button = cascade! {
             gtk4::MenuButton::new();
             ..set_parent(obj);
+            ..set_has_frame(false);
             ..set_direction(gtk4::ArrowType::None);
             ..style_context().remove_class("toggle");
             ..set_popover(Some(&cascade! {
diff --git a/src/window.rs b/src/window.rs
index bc9b3fb1..c8d863da 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -29,11 +29,11 @@ impl ObjectImpl for PanelWindowInner {
                 gtk4::Box::new(gtk4::Orientation::Horizontal, 0);
                 ..append(&cascade! {
                     gtk4::Button::with_label("Workspaces");
-                    ..style_context().add_class("flat");
+                    ..set_has_frame(false);
                 });
                 ..append(&cascade! {
                     gtk4::Button::with_label("Applications");
-                    ..style_context().add_class("flat");
+                    ..set_has_frame(false);
                 });
             }));
             ..set_center_widget(Some(&TimeButton::new()));