diff --git a/data/css/default.css b/data/css/default.css
index a7384d13..f65b491a 100644
--- a/data/css/default.css
+++ b/data/css/default.css
@@ -24,6 +24,7 @@
 .wf-panel .battery label,
 .wf-panel .battery:hover label,
 .wf-panel .window-button label,
+.wf-panel .window-button image,
 .wf-panel .window-button:hover label,
 .wf-panel .tray-button,
 .wf-panel .tray-button:hover,
@@ -31,6 +32,15 @@
     padding-left: 5px;
 }
 
+
+.wf-panel .window-button.activated {
+    background-color: #8883;
+}
+
+.wf-panel .window-button:hover {
+    background-color: #8882;
+}
+
 .wf-panel .battery overlay label {
 --bcol: rgb(from currentcolor calc(255 - r) calc(255 - g) calc(255 - b) );
 text-shadow: 1px  1px 0 var(--bcol),
@@ -94,7 +104,7 @@ text-shadow: 1px  1px 0 var(--bcol),
     background-color: #24283B;
     padding: 5px;
     margin: 5px;
-    border-radius: 3px; 
+    border-radius: 3px;
     color: #41A6B5;
 }
 
@@ -132,6 +142,15 @@ text-shadow: 1px  1px 0 var(--bcol),
     background-color: #00FFAA77;
     border: 1px solid #222;
 }
+
+.wf-panel .wf-menu.selected {
+    background-color:#8883;
+}
+
+.wf-panel .wf-menu:hover {
+    background-color: #8882;
+}
+
 .excellent {
     color: #00ff00;
 }
diff --git a/data/css/panel-window-list-zoom-hover.css b/data/css/panel-window-list-zoom-hover.css
index 6349a2df..7750b7e4 100644
--- a/data/css/panel-window-list-zoom-hover.css
+++ b/data/css/panel-window-list-zoom-hover.css
@@ -1,23 +1,23 @@
 /* Default size not-selected not-hovered */
-.wf-panel .window-button.flat image {
+.wf-panel .window-button image {
     transition: 500ms linear;
     -gtk-icon-transform: scale(1.0);
 }
 
 /* Double size not-selected hovered */
-.wf-panel .window-button.flat:hover image {
+.wf-panel .window-button:hover image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(2.0);
 }
 
 /* +50% size selected not-hovered */
-.wf-panel .window-button image {
+.wf-panel .window-button.activated image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(1.5);
 }
 
 /* Double size selected hovered */
-.wf-panel .window-button:hover image {
+.wf-panel .window-button.activated:hover image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(2.0);
 }
\ No newline at end of file
diff --git a/metadata/panel.xml b/metadata/panel.xml
index cb53132d..429e3f63 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -75,6 +75,15 @@
 			<_name>Background</_name>
 		</desc>
 	</option>
+	<option name="force_show_popup" type="bool">
+		<_short>Force showing the popups</_short>
+		<_long>Show the popup over other windows, even if it and the panel would be hidden otherwise.</_long>
+		<default>true</default>
+	</option>
+	<option name="menus_change_motion" type="bool">
+		<_short>Change between open menu with mouse motion</_short>
+		<default>false</default>
+	</option>
 	<option name="background_color" type="string">
 		<_short>Background Color</_short>
 		<default>gtk_headerbar</default>
@@ -203,11 +212,6 @@
 		<default>42</default>
 		<min>0</min>
 	</option>
-	<option name="menu_force_show_popup" type="bool">
-		<_short>Force showing the menu popup</_short>
-		<_long>Show the menu popup over other windows, even if it and the panel would be hidden otherwise.</_long>
-		<default>true</default>
-	</option>
 	<option name="menu_min_category_width" type="int">
 		<_short>Menu Minimum Category Width</_short>
 		<default>200</default>
diff --git a/src/locker/plugin/volume.hpp b/src/locker/plugin/volume.hpp
index 5d254bd9..3ee193bc 100644
--- a/src/locker/plugin/volume.hpp
+++ b/src/locker/plugin/volume.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include <memory>
 #include <gtkmm/button.h>
-#include <gtkmm/popover.h>
 #include <gtkmm/scale.h>
 #include <pulse/pulseaudio.h>
 
diff --git a/src/panel/widgets/clock.cpp b/src/panel/widgets/clock.cpp
index a521c4b8..310f7e5c 100644
--- a/src/panel/widgets/clock.cpp
+++ b/src/panel/widgets/clock.cpp
@@ -3,20 +3,18 @@
 
 void WayfireClock::init(Gtk::Box *container)
 {
-    button = std::make_unique<WayfireMenuButton>("panel");
+    button = std::make_unique<WayfireMenuWidget>("panel", "clock");
     button->add_css_class("clock");
-    button->set_child(label);
-    button->show();
+    button->append(label);
+    button->open_on(1);
     label.set_justify(Gtk::Justification::CENTER);
     label.show();
 
     update_label();
 
     calendar.show();
-    button->get_popover()->add_css_class("clock-popover");
-    button->get_children()[0]->add_css_class("flat");
-    button->get_popover()->set_child(calendar);
-    btn_sig = button->get_popover()->signal_show().connect(
+    button->set_popup_child(calendar);
+    btn_sig = button->signal_popup().connect(
         sigc::mem_fun(*this, &WayfireClock::on_calendar_shown));
 
     container->append(*button);
diff --git a/src/panel/widgets/clock.hpp b/src/panel/widgets/clock.hpp
index 1685f2be..858f842f 100644
--- a/src/panel/widgets/clock.hpp
+++ b/src/panel/widgets/clock.hpp
@@ -9,7 +9,7 @@ class WayfireClock : public WayfireWidget
 {
     Gtk::Label label;
     Gtk::Calendar calendar;
-    std::unique_ptr<WayfireMenuButton> button;
+    std::unique_ptr<WayfireMenuWidget> button;
 
     sigc::connection timeout, btn_sig;
     WfOption<std::string> format{"panel/clock_format"};
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 7a73d568..754ee389 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -11,6 +11,7 @@
 #include "menu.hpp"
 #include "gtk-utils.hpp"
 #include "wf-autohide-window.hpp"
+#include "wf-popover.hpp"
 
 const std::string default_icon = "wayfire";
 
@@ -515,12 +516,6 @@ void WayfireMenu::on_popover_shown()
     on_search_changed();
     set_category("All");
     flowbox.unselect_all();
-
-    if (force_show_popup.value())
-    {
-        Gtk::Window *window = dynamic_cast<Gtk::Window*>(button->get_root());
-        gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
-    }
 }
 
 bool WayfireMenu::update_icon()
@@ -540,13 +535,7 @@ bool WayfireMenu::update_icon()
 
 void WayfireMenu::setup_popover_layout()
 {
-    if (menu_fullscreen)
-    {
-        fullscreen.set_child(popover_layout_box);
-    } else
-    {
-        button->get_popover()->set_child(popover_layout_box);
-    }
+    button->set_popup_child(popover_layout_box);
 
     flowbox.set_selection_mode(Gtk::SelectionMode::SINGLE);
     flowbox.set_activate_on_single_click(true);
@@ -613,8 +602,7 @@ void WayfireMenu::setup_popover_layout()
             return true;
         } else if (keyval == GDK_KEY_Escape)
         {
-            button->get_popover()->hide();
-            fullscreen.hide();
+            button->popdown();
             return true;
         } else if ((keyval == GDK_KEY_Up) ||
                    (keyval == GDK_KEY_Down) ||
@@ -649,36 +637,6 @@ void WayfireMenu::setup_popover_layout()
         }
     }, false));
     popover_layout_box.add_controller(typing_gesture);
-    signals.push_back(button->get_popover()->signal_closed().connect([=] ()
-    {
-        if (!force_show_popup.value())
-        {
-            return;
-        }
-
-        Gtk::Window *window = dynamic_cast<Gtk::Window*>(button->get_root());
-        WfOption<std::string> panel_layer{"panel/layer"};
-
-        if ((std::string)panel_layer == "overlay")
-        {
-            gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
-        }
-
-        if ((std::string)panel_layer == "top")
-        {
-            gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_TOP);
-        }
-
-        if ((std::string)panel_layer == "bottom")
-        {
-            gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_BOTTOM);
-        }
-
-        if ((std::string)panel_layer == "background")
-        {
-            gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_BACKGROUND);
-        }
-    }));
 }
 
 void WayfireMenu::update_popover_layout()
@@ -857,8 +815,7 @@ WayfireLogoutUI::~WayfireLogoutUI()
 
 void WayfireMenu::on_logout_click()
 {
-    button->get_popover()->hide();
-    fullscreen.hide();
+    button->popdown();
     if (!std::string(menu_logout_command).empty())
     {
         g_spawn_command_line_async(std::string(menu_logout_command).c_str(), NULL);
@@ -940,27 +897,15 @@ void WayfireMenu::init(Gtk::Box *container)
     menu_show_categories.set_callback([=] () { update_popover_layout(); });
     menu_list.set_callback([=] () { update_popover_layout(); });
 
-    button = std::make_unique<WayfireMenuButton>("panel");
-    fullscreen.add_css_class("menu-fullscreen");
-    button->set_child(main_image);
+    button = std::make_unique<WayfireMenuWidget>("panel", "menu");
+    button->append(main_image);
     button->add_css_class("menu-button");
     button->add_css_class("flat");
-    button->get_popover()->add_css_class("menu-popover");
     button->get_children()[0]->add_css_class("flat");
-    signals.push_back(button->get_popover()->signal_show().connect(
+    button->open_on(1); /* Open menu on left click */
+    signals.push_back(button->signal_popup().connect(
         sigc::mem_fun(*this, &WayfireMenu::on_popover_shown)));
 
-    /* Prepare fullscreen layer */
-    gtk_layer_init_for_window(fullscreen.gobj());
-    gtk_layer_set_monitor(fullscreen.gobj(), output->monitor->gobj());
-    gtk_layer_set_namespace(fullscreen.gobj(), "panelmenu");
-    gtk_layer_set_anchor(fullscreen.gobj(), GTK_LAYER_SHELL_EDGE_TOP, true);
-    gtk_layer_set_anchor(fullscreen.gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, true);
-    gtk_layer_set_anchor(fullscreen.gobj(), GTK_LAYER_SHELL_EDGE_LEFT, true);
-    gtk_layer_set_anchor(fullscreen.gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, true);
-    gtk_layer_set_layer(fullscreen.gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
-    gtk_layer_set_keyboard_mode(fullscreen.gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE);
-
     if (!update_icon())
     {
         return;
@@ -969,20 +914,7 @@ void WayfireMenu::init(Gtk::Box *container)
     signals.push_back(button->property_scale_factor().signal_changed().connect(
         [=] () {update_icon(); }));
 
-    menu_fullscreen.set_callback([=] ()
-    {
-        fullscreen.hide();
-        button->set_active(false);
-        if (menu_fullscreen)
-        {
-            gtk_popover_set_child(button->get_popover()->gobj(), nullptr);
-            fullscreen.set_child(popover_layout_box);
-        } else
-        {
-            gtk_window_set_child(fullscreen.gobj(), nullptr);
-            button->get_popover()->set_child(popover_layout_box);
-        }
-    });
+    button->set_popup_child(popover_layout_box);
 
     container->append(box);
     box.append(*button);
@@ -999,6 +931,13 @@ void WayfireMenu::init(Gtk::Box *container)
     }));
     box.add_controller(click_gesture);
 
+    auto menu_fs_changed = [=]
+    {
+        button->set_fullscreen(menu_fullscreen.value());
+    };
+    menu_fullscreen.set_callback(menu_fs_changed);
+    menu_fs_changed();
+
     logout_image.set_icon_size(Gtk::IconSize::LARGE);
     logout_image.set_from_icon_name("system-shutdown");
     logout_button.add_css_class("flat");
@@ -1018,7 +957,7 @@ void WayfireMenu::init(Gtk::Box *container)
     update_popover_layout();
     populate_menu_categories();
     populate_menu_items("All");
-
+    app_info_monitor = g_app_info_monitor_get();
     app_info_monitor_changed_handler_id =
         g_signal_connect(app_info_monitor, "changed", G_CALLBACK(app_info_changed), this);
 
@@ -1046,27 +985,13 @@ void WayfireMenu::update_content_width()
 void WayfireMenu::toggle_menu()
 {
     search_entry.set_text("");
-    if (menu_fullscreen)
-    {
-        if (fullscreen.is_visible())
-        {
-            fullscreen.hide();
-        } else
-        {
-            fullscreen.show();
-            on_popover_shown();
-        }
 
-        return;
-    }
-
-    button->set_active(!button->get_active());
+    button->toggle();
 }
 
 void WayfireMenu::hide_menu()
 {
-    button->set_active(false);
-    fullscreen.hide();
+    button->popdown();
 }
 
 void WayfireMenu::set_category(std::string in_category)
@@ -1090,7 +1015,11 @@ void WayfireMenu::select_first_flowbox_item()
 
 WayfireMenu::~WayfireMenu()
 {
-    g_signal_handler_disconnect(app_info_monitor, app_info_monitor_changed_handler_id);
+    if (app_info_monitor)
+    {
+        g_signal_handler_disconnect(app_info_monitor, app_info_monitor_changed_handler_id);
+    }
+
     for (auto signal : signals)
     {
         signal.disconnect();
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 637bce92..df83a7a2 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -135,11 +135,10 @@ class WayfireMenu : public WayfireWidget
     Gtk::Button logout_button;
     Gtk::Image logout_image;
     Gtk::ScrolledWindow app_scrolled_window, category_scrolled_window;
-    Gtk::Window fullscreen;
-    std::unique_ptr<WayfireMenuButton> button;
+    std::unique_ptr<WayfireMenuWidget> button;
     std::unique_ptr<WayfireLogoutUI> logout_ui;
 
-    GAppInfoMonitor *app_info_monitor = g_app_info_monitor_get();
+    GAppInfoMonitor *app_info_monitor = nullptr;
     guint app_info_monitor_changed_handler_id;
 
     void load_menu_item(AppInfo app_info);
@@ -175,7 +174,6 @@ class WayfireMenu : public WayfireWidget
     WfOption<bool> fuzzy_search_enabled{"panel/menu_fuzzy_search"};
     WfOption<std::string> panel_position{"panel/position"};
     WfOption<std::string> menu_icon{"panel/menu_icon"};
-    WfOption<bool> force_show_popup{"panel/menu_force_show_popup"};
     WfOption<int> menu_min_category_width{"panel/menu_min_category_width"};
     WfOption<int> menu_min_content_height{"panel/menu_min_content_height"};
     WfOption<bool> menu_show_categories{"panel/menu_show_categories"};
diff --git a/src/panel/widgets/notifications/notification-center.cpp b/src/panel/widgets/notifications/notification-center.cpp
index 2ffa3007..c082cad3 100644
--- a/src/panel/widgets/notifications/notification-center.cpp
+++ b/src/panel/widgets/notifications/notification-center.cpp
@@ -6,26 +6,26 @@
 #include <gtk-utils.hpp>
 
 #include "single-notification.hpp"
+#include "wf-popover.hpp"
 
 void WayfireNotificationCenter::init(Gtk::Box *container)
 {
-    button = std::make_unique<WayfireMenuButton>("panel");
+    button = std::make_unique<WayfireMenuWidget>("panel", "notification");
     icon.add_css_class("widget-icon");
     button->add_css_class("notification-center");
     button->get_children()[0]->add_css_class("flat");
 
     updateIcon();
-    button->set_child(icon);
+    button->append(icon);
+    button->open_on(1);
     container->append(*button);
 
-    auto *popover = button->get_popover();
-    popover->set_size_request(WIDTH, HEIGHT);
-    popover->add_css_class("notification-popover");
+    scrolled_window.set_size_request(WIDTH, HEIGHT);
 
     box.set_valign(Gtk::Align::START);
     box.set_orientation(Gtk::Orientation::VERTICAL);
     scrolled_window.set_child(box);
-    popover->set_child(scrolled_window);
+    button->set_popup_child(scrolled_window);
 
     button->set_tooltip_text("Middle click to toggle DND mode.");
 
@@ -79,14 +79,13 @@ void WayfireNotificationCenter::newNotification(Notification::id_type id, bool s
     widget->set_reveal_child();
     if (show_popup && !dnd_enabled || (show_critical_in_dnd && (notification.hints.urgency == 2)))
     {
-        auto *popover = button->get_popover();
-        if ((timeout > 0) && (!popover_timeout.empty() || !popover->is_visible()))
+        if ((timeout > 0) && (!popover_timeout.empty() || !button->is_popup_visible()))
         {
             popover_timeout.disconnect();
             popover_timeout = Glib::signal_timeout().connect(
                 [=]
             {
-                popover->popdown();
+                button->popdown();
                 button->set_keyboard_interactive();
                 popover_timeout.disconnect();
                 return true;
@@ -95,7 +94,7 @@ void WayfireNotificationCenter::newNotification(Notification::id_type id, bool s
         }
 
         button->set_keyboard_interactive(false);
-        popover->popup();
+        button->popup();
     }
 }
 
diff --git a/src/panel/widgets/notifications/notification-center.hpp b/src/panel/widgets/notifications/notification-center.hpp
index 08995324..7014fbc1 100644
--- a/src/panel/widgets/notifications/notification-center.hpp
+++ b/src/panel/widgets/notifications/notification-center.hpp
@@ -19,7 +19,7 @@ class WayfireNotificationCenter : public WayfireWidget
     sigc::connection notification_close_conn;
 
     Gtk::Image icon;
-    std::unique_ptr<WayfireMenuButton> button;
+    std::unique_ptr<WayfireMenuWidget> button;
     Gtk::ScrolledWindow scrolled_window;
     Gtk::Box box;
 
diff --git a/src/panel/widgets/tray/item.cpp b/src/panel/widgets/tray/item.cpp
index fae84034..86996c91 100644
--- a/src/panel/widgets/tray/item.cpp
+++ b/src/panel/widgets/tray/item.cpp
@@ -1,4 +1,5 @@
 #include "item.hpp"
+#include "wf-popover.hpp"
 
 #include <gtk-utils.hpp>
 
@@ -49,9 +50,12 @@ static Glib::RefPtr<Gdk::Pixbuf> extract_pixbuf(IconData && pixbuf_data)
         4 * width, [data_ptr] (auto*) { delete data_ptr; });
 }
 
-StatusNotifierItem::StatusNotifierItem(const Glib::ustring & service)
+StatusNotifierItem::StatusNotifierItem(const Glib::ustring & service) :
+    WayfireMenuWidget("panel",
+        "tray-button",
+        "tray_button")
 {
-    set_child(icon);
+    append(icon);
     menu = std::make_shared<DbusMenuModel>();
 
     const auto & [name, path] = name_and_obj_path(service);
@@ -68,15 +72,6 @@ StatusNotifierItem::StatusNotifierItem(const Glib::ustring & service)
     });
 }
 
-StatusNotifierItem::~StatusNotifierItem()
-{
-    gtk_widget_unparent(GTK_WIDGET(popover.gobj()));
-    for (auto signal : signals)
-    {
-        signal.disconnect();
-    }
-}
-
 void StatusNotifierItem::init_widget()
 {
     update_icon();
@@ -84,8 +79,6 @@ void StatusNotifierItem::init_widget()
     init_menu();
     add_css_class("widget-icon");
     add_css_class("tray-button");
-    add_css_class("flat");
-    gtk_widget_set_parent(GTK_WIDGET(popover.gobj()), GTK_WIDGET(gobj()));
 
     auto scroll_gesture = Gtk::EventControllerScroll::create();
     scroll_gesture->set_flags(Gtk::EventControllerScroll::Flags::BOTH_AXES);
@@ -103,7 +96,7 @@ void StatusNotifierItem::init_widget()
     long_press->signal_pressed().connect(
         [=] (double x, double y)
     {
-        popover.popup();
+        popup();
         long_press->set_state(Gtk::EventSequenceState::CLAIMED);
         click_gesture->set_state(Gtk::EventSequenceState::DENIED);
     });
@@ -127,7 +120,7 @@ void StatusNotifierItem::init_widget()
             {
                 if (has_menu)
                 {
-                    popover.popup();
+                    popup();
                 } else
                 {
                     item_proxy->call("ContextMenu", ev_coords);
@@ -140,7 +133,7 @@ void StatusNotifierItem::init_widget()
         {
             if (has_menu)
             {
-                popover.popup();
+                popup();
             } else
             {
                 item_proxy->call("ContextMenu", ev_coords);
@@ -238,7 +231,7 @@ void StatusNotifierItem::init_menu()
     {
         auto action_group = menu->get_action_group();
         insert_action_group(action_prefix, action_group);
-        popover.set_menu_model(menu->get_menu());
+        set_menu_model(menu->get_menu());
     }));
     has_menu = true;
 }
diff --git a/src/panel/widgets/tray/item.hpp b/src/panel/widgets/tray/item.hpp
index 0a8bd1d9..75df9b3e 100644
--- a/src/panel/widgets/tray/item.hpp
+++ b/src/panel/widgets/tray/item.hpp
@@ -9,8 +9,9 @@
 #include <string>
 
 #include "dbusmenu.hpp"
+#include "wf-popover.hpp"
 
-class StatusNotifierItem : public Gtk::Button
+class StatusNotifierItem : public WayfireMenuWidget
 {
     guint menu_handler_id;
 
@@ -21,7 +22,6 @@ class StatusNotifierItem : public Gtk::Button
 
     Glib::RefPtr<Gio::DBus::Proxy> item_proxy;
 
-    Gtk::PopoverMenu popover;
     std::shared_ptr<DbusMenuModel> menu;
 
     bool has_menu = false;
@@ -60,6 +60,5 @@ class StatusNotifierItem : public Gtk::Button
   public:
     void menu_update(DbusmenuClient *client);
     explicit StatusNotifierItem(const Glib::ustring & service);
-    ~StatusNotifierItem();
     std::string get_unique_name();
 };
diff --git a/src/panel/widgets/volume.cpp b/src/panel/widgets/volume.cpp
index 1aca2724..d4d9f4ff 100644
--- a/src/panel/widgets/volume.cpp
+++ b/src/panel/widgets/volume.cpp
@@ -1,8 +1,11 @@
 #include <gtkmm.h>
 #include <glibmm.h>
-
 #include "volume.hpp"
+#include "glib.h"
+#include "glibmm/main.h"
+#include "gtkmm/gesture.h"
 #include "icon-select.hpp"
+#include "wf-popover.hpp"
 
 #define ICON(volume) icon_from_range(volume_icons, volume)
 
@@ -17,20 +20,6 @@ void WayfireVolume::update_icon()
     main_image.set_from_icon_name(ICON(volume_scale.get_target_value() / (double)max_norm));
 }
 
-bool WayfireVolume::on_popover_timeout(int timer)
-{
-    popover->popdown();
-    return false;
-}
-
-void WayfireVolume::check_set_popover_timeout()
-{
-    popover_timeout.disconnect();
-
-    popover_timeout = Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(*this,
-        &WayfireVolume::on_popover_timeout), 0), timeout * 1000);
-}
-
 void WayfireVolume::set_volume(pa_volume_t volume, set_volume_flags_t flags)
 {
     volume_scale.set_target_value(volume);
@@ -40,17 +29,6 @@ void WayfireVolume::set_volume(pa_volume_t volume, set_volume_flags_t flags)
         gvc_mixer_stream_push_volume(gvc_stream);
     }
 
-    if (flags & VOLUME_FLAG_SHOW_POPOVER)
-    {
-        if (!popover->is_visible())
-        {
-            popover->popup();
-        } else
-        {
-            check_set_popover_timeout();
-        }
-    }
-
     update_icon();
 }
 
@@ -62,7 +40,11 @@ void WayfireVolume::on_volume_changed_external()
         set_volume(volume, VOLUME_FLAG_SHOW_POPOVER);
     }
 
-    check_set_popover_timeout();
+    Glib::signal_idle().connect([=] ()
+    {
+        button->popup_timed(timeout * 1000);
+        return G_SOURCE_REMOVE;
+    });
 }
 
 static void notify_volume(GvcMixerControl *gvc_control,
@@ -137,16 +119,30 @@ void WayfireVolume::on_volume_value_changed()
 
 void WayfireVolume::init(Gtk::Box *container)
 {
-    button = std::make_unique<WayfireMenuButton>("panel");
-
-    /* Setup button */
-    button->add_css_class("widget-icon");
-    button->add_css_class("volume");
-    button->add_css_class("flat");
-    button->get_children()[0]->add_css_class("flat");
+    main_image.add_css_class("widget-icon");
+    button = std::make_unique<WayfireMenuWidget>("panel", "volume");
+    button->set_keyboard_interactive(false);
 
+    auto middle_click_gesture = Gtk::GestureClick::create();
+    auto long_press     = Gtk::GestureLongPress::create();
     auto scroll_gesture = Gtk::EventControllerScroll::create();
-    scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
+    auto scroll_gesture2 = Gtk::EventControllerScroll::create();
+
+    scroll_gesture->set_flags(Gtk::EventControllerScroll::Flags::VERTICAL);
+    scroll_gesture->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
+    scroll_gesture2->set_flags(Gtk::EventControllerScroll::Flags::VERTICAL);
+    scroll_gesture2->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
+
+    long_press->set_touch_only(true);
+    middle_click_gesture->set_button(2);
+
+    /* Setup gvc control */
+    gvc_control = gvc_mixer_control_new("Wayfire Volume Control");
+    notify_default_sink_changed = g_signal_connect(gvc_control,
+        "default-sink-changed", G_CALLBACK(default_sink_changed), this);
+    gvc_mixer_control_open(gvc_control);
+
+    signals.push_back(scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
     {
         int change = 0;
         if (scroll_gesture->get_unit() == Gdk::ScrollUnit::WHEEL)
@@ -162,18 +158,7 @@ void WayfireVolume::init(Gtk::Box *container)
         set_volume(std::clamp(volume_scale.get_target_value() - change,
             0.0, max_norm));
         return true;
-    }, true);
-    scroll_gesture->set_flags(Gtk::EventControllerScroll::Flags::VERTICAL);
-    scroll_gesture->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
-    button->add_controller(scroll_gesture);
-
-    /* Setup popover */
-    popover = button->get_popover();
-    popover->set_autohide(false);
-    popover->set_child(volume_scale);
-    popover->add_css_class("volume-popover");
-
-    auto scroll_gesture2 = Gtk::EventControllerScroll::create();
+    }, true));
     signals.push_back(scroll_gesture2->signal_scroll().connect([=] (double dx, double dy)
     {
         int change = 0;
@@ -191,48 +176,7 @@ void WayfireVolume::init(Gtk::Box *container)
             0.0, max_norm));
         return true;
     }, false));
-    scroll_gesture2->set_flags(Gtk::EventControllerScroll::Flags::VERTICAL);
-    scroll_gesture2->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
-    volume_scale.add_controller(scroll_gesture2);
-
-    volume_scale.set_draw_value(false);
-    volume_scale.set_size_request(300, 0);
-    volume_scale.set_user_changed_callback([=] () { on_volume_value_changed(); });
-
-    signals.push_back(volume_scale.signal_state_flags_changed().connect(
-        [=] (Gtk::StateFlags) { check_set_popover_timeout(); }));
-
-    /* Setup gvc control */
-    gvc_control = gvc_mixer_control_new("Wayfire Volume Control");
-    notify_default_sink_changed = g_signal_connect(gvc_control,
-        "default-sink-changed", G_CALLBACK(default_sink_changed), this);
-    gvc_mixer_control_open(gvc_control);
-
-    /* Ensure left click reliably toggles scale popover */
-    auto left_click_gesture = Gtk::GestureClick::create();
-    left_click_gesture->set_button(1);
-    left_click_gesture->signal_pressed().connect([=] (int count, double x, double y)
-    {
-        left_click_gesture->set_state(Gtk::EventSequenceState::CLAIMED);
-    });
-    left_click_gesture->signal_released().connect([=] (int count, double x, double y)
-    {
-        if (popover->is_visible())
-        {
-            popover->popdown();
-            popover_timeout.disconnect();
-        } else
-        {
-            popover->popup();
-            check_set_popover_timeout();
-        }
-    });
-
-    /* Middle click toggle mute */
-    auto middle_click_gesture = Gtk::GestureClick::create();
-    auto long_press = Gtk::GestureLongPress::create();
-    long_press->set_touch_only(true);
-    long_press->signal_pressed().connect(
+    signals.push_back(long_press->signal_pressed().connect(
         [=] (double x, double y)
     {
         bool muted = !(gvc_stream && gvc_mixer_stream_get_is_muted(gvc_stream));
@@ -240,8 +184,7 @@ void WayfireVolume::init(Gtk::Box *container)
         gvc_mixer_stream_push_volume(gvc_stream);
         long_press->set_state(Gtk::EventSequenceState::CLAIMED);
         middle_click_gesture->set_state(Gtk::EventSequenceState::DENIED);
-    });
-    middle_click_gesture->set_button(2);
+    }));
     signals.push_back(middle_click_gesture->signal_pressed().connect([=] (int count, double x, double y)
     {
         middle_click_gesture->set_state(Gtk::EventSequenceState::CLAIMED);
@@ -252,18 +195,24 @@ void WayfireVolume::init(Gtk::Box *container)
         gvc_mixer_stream_change_is_muted(gvc_stream, muted);
         gvc_mixer_stream_push_volume(gvc_stream);
     }));
+
+    volume_scale.set_draw_value(false);
+    volume_scale.set_size_request(300, 0);
+    volume_scale.set_user_changed_callback([=] () { on_volume_value_changed(); });
+    volume_scale.add_controller(scroll_gesture2);
+    // button->add_controller(scroll_gesture);
     button->add_controller(long_press);
-    button->add_controller(left_click_gesture);
     button->add_controller(middle_click_gesture);
+    button->open_on(1);
 
     /* Setup layout */
     container->append(*button);
-    button->set_child(main_image);
+    button->append(main_image);
+    button->set_popup_child(volume_scale);
 }
 
 WayfireVolume::~WayfireVolume()
 {
-    gtk_widget_unparent(GTK_WIDGET(popover->gobj()));
     disconnect_gvc_stream_signals();
 
     if (notify_default_sink_changed)
@@ -273,6 +222,4 @@ WayfireVolume::~WayfireVolume()
 
     gvc_mixer_control_close(gvc_control);
     g_object_unref(gvc_control);
-
-    popover_timeout.disconnect();
 }
diff --git a/src/panel/widgets/volume.hpp b/src/panel/widgets/volume.hpp
index dc5a6d18..f52ef247 100644
--- a/src/panel/widgets/volume.hpp
+++ b/src/panel/widgets/volume.hpp
@@ -13,8 +13,7 @@ class WayfireVolume : public WayfireWidget
 {
     Gtk::Image main_image;
     WayfireAnimatedScale volume_scale;
-    std::unique_ptr<WayfireMenuButton> button;
-    Gtk::Popover *popover;
+    std::unique_ptr<WayfireMenuWidget> button;
 
     WfOption<double> timeout{"panel/volume_display_timeout"};
     WfOption<double> scroll_sensitivity{"panel/volume_scroll_sensitivity"};
@@ -22,7 +21,6 @@ class WayfireVolume : public WayfireWidget
     // void on_volume_scroll(GdkEventScroll *event);
     // void on_volume_button_press(GdkEventButton *event);
     void on_volume_value_changed();
-    bool on_popover_timeout(int timer);
 
     GvcMixerControl *gvc_control;
     GvcMixerStream *gvc_stream = NULL;
@@ -31,7 +29,6 @@ class WayfireVolume : public WayfireWidget
     gulong notify_volume_signal   = 0;
     gulong notify_is_muted_signal = 0;
     gulong notify_default_sink_changed = 0;
-    sigc::connection popover_timeout;
     std::vector<sigc::connection> signals;
     void disconnect_gvc_stream_signals();
 
@@ -68,9 +65,4 @@ class WayfireVolume : public WayfireWidget
 
     /** Called when the default sink changes */
     void on_default_sink_changed();
-
-    /**
-     * Check whether the popover should be auto-hidden, and if yes, start a timer to hide it
-     */
-    void check_set_popover_timeout();
 };
diff --git a/src/panel/widgets/window-list/toplevel.cpp b/src/panel/widgets/window-list/toplevel.cpp
index cc9c8ab9..ac78a3a8 100644
--- a/src/panel/widgets/window-list/toplevel.cpp
+++ b/src/panel/widgets/window-list/toplevel.cpp
@@ -11,6 +11,8 @@
 #include <sys/mman.h>
 
 #include "toplevel.hpp"
+#include "gtkmm/enums.h"
+#include "gtkmm/gesture.h"
 #include "window-list.hpp"
 #include "gtk-utils.hpp"
 
@@ -398,7 +400,6 @@ class WayfireToplevel::impl
     uint32_t state;
     uint64_t view_id;
 
-    Gtk::Button button;
     Gtk::Box custom_tooltip_content;
     TooltipMedia *tooltip_media;
     Glib::RefPtr<Gio::SimpleActionGroup> actions;
@@ -408,7 +409,7 @@ class WayfireToplevel::impl
     Glib::RefPtr<Gio::MenuItem> minimize, maximize, close;
     Glib::RefPtr<Gio::SimpleAction> minimize_action, maximize_action, close_action;
     // Gtk::Box menu_box;
-    Gtk::Box button_contents;
+    Gtk::Box button;
     Gtk::Image image;
     Gtk::Label label;
     // Gtk::PopoverMenu menu;
@@ -432,17 +433,16 @@ class WayfireToplevel::impl
             &toplevel_handle_v1_impl, this);
 
         button.add_css_class("window-button");
-        button.add_css_class("flat");
         button.remove_css_class("activated");
-        button_contents.append(image);
-        button_contents.append(label);
-        button_contents.set_halign(Gtk::Align::START);
-        button_contents.set_hexpand(true);
-        button_contents.set_spacing(5);
-        button.set_child(button_contents);
+        button.append(image);
+        button.append(label);
+        button.set_halign(Gtk::Align::FILL);
+        button.set_hexpand(true);
+        button.set_spacing(5);
 
         label.set_ellipsize(Pango::EllipsizeMode::END);
         label.set_hexpand(true);
+        label.set_halign(Gtk::Align::START);
 
         button.property_scale_factor().signal_changed()
             .connect(sigc::mem_fun(*this, &WayfireToplevel::impl::on_scale_update));
@@ -463,8 +463,6 @@ class WayfireToplevel::impl
         actions->add_action(minimize_action);
         actions->add_action(maximize_action);
 
-        // Hey Kids, want to see a really stupid idea?
-        // Button can only have one child! But setting the parent of a popover still works fine...
         gtk_widget_set_parent(GTK_WIDGET(popover.gobj()), GTK_WIDGET(button.gobj()));
 
         popover.insert_action_group("windowaction", actions);
@@ -493,16 +491,16 @@ class WayfireToplevel::impl
         signals.push_back(long_press->signal_pressed().connect(
             [=] (double x, double y)
         {
-            popover.popup();
+            drag_exceeds_threshold = true; /* A lie, but fixes long touch again */
             long_press->set_state(Gtk::EventSequenceState::CLAIMED);
             click_gesture->set_state(Gtk::EventSequenceState::DENIED);
+            drag_gesture->set_state(Gtk::EventSequenceState::DENIED);
+            popover.popup();
         }));
         click_gesture->set_button(0);
         signals.push_back(click_gesture->signal_pressed().connect(
             [=] (int count, double x, double y)
-        {
-            click_gesture->set_state(Gtk::EventSequenceState::CLAIMED);
-        }));
+        {}));
 
         signals.push_back(click_gesture->signal_released().connect(
             [=] (int count, double x, double y)
@@ -980,10 +978,8 @@ class WayfireToplevel::impl
         if (state & WF_TOPLEVEL_STATE_ACTIVATED)
         {
             button.add_css_class("activated");
-            button.remove_css_class("flat");
         } else
         {
-            button.add_css_class("flat");
             button.remove_css_class("activated");
         }
 
diff --git a/src/panel/widgets/workspace-switcher.cpp b/src/panel/widgets/workspace-switcher.cpp
index f91dca61..3e985e42 100644
--- a/src/panel/widgets/workspace-switcher.cpp
+++ b/src/panel/widgets/workspace-switcher.cpp
@@ -5,6 +5,7 @@
 #include <wf-option-wrap.hpp>
 
 #include "panel.hpp"
+#include "wf-popover.hpp"
 #include "workspace-switcher.hpp"
 
 void WayfireWorkspaceSwitcher::init(Gtk::Box *container)
@@ -20,9 +21,7 @@ void WayfireWorkspaceSwitcher::init(Gtk::Box *container)
     box.add_css_class("workspace-switcher");
     box.add_css_class("flat");
 
-    button = std::make_unique<WayfireMenuButton>("panel");
-    button->get_children()[0]->add_css_class("flat");
-    button->get_children()[0]->add_css_class("workspace-switcher");
+    button = std::make_unique<WayfireMenuWidget>("panel", "workspace-switcher", "workspace_switcher");
 
     ipc_client->subscribe(this, {"view-mapped"});
     ipc_client->subscribe(this, {"view-focused"});
@@ -46,14 +45,17 @@ void WayfireWorkspaceSwitcher::init(Gtk::Box *container)
         if (workspace_switcher_mode.value() == "row")
         {
             switcher_box.append(box);
+            button->open_on(-1);
         } else if (workspace_switcher_mode.value() == "grid")
         {
             switcher_box.append(overlay);
+            button->open_on(-1);
         } else // "grid_popover"
         {
-            button->get_popover()->set_child(overlay);
-            button->set_child(mini_grid);
+            button->set_popup_child(overlay);
+            button->append(mini_grid);
             switcher_box.append(*button);
+            button->open_on(1);
         }
 
         get_wsets();
@@ -451,8 +453,7 @@ void WayfireWorkspaceSwitcher::grid_process_workspaces(wf::json_t workspace_data
                 }
 
                 clear_box();
-                button->m_popover.set_parent(mini_grid);
-                button->m_popover.set_child(overlay);
+                button->set_popup_child(overlay);
                 overlay.set_child(switch_grid);
                 overlay.add_css_class("workspace");
                 overlay.signal_get_child_position().connect(sigc::mem_fun(*this,
diff --git a/src/panel/widgets/workspace-switcher.hpp b/src/panel/widgets/workspace-switcher.hpp
index be5ed99d..c7b0123f 100644
--- a/src/panel/widgets/workspace-switcher.hpp
+++ b/src/panel/widgets/workspace-switcher.hpp
@@ -51,7 +51,7 @@ class WayfireWorkspaceSwitcher : public WayfireWidget, public IIPCSubscriber
     Gtk::Grid switch_grid;
     Gtk::Overlay overlay;
     double get_scaled_width();
-    std::unique_ptr<WayfireMenuButton> button;
+    std::unique_ptr<WayfireMenuWidget> button;
     int output_width, output_height;
     void init(Gtk::Box *container) override;
     WayfireWorkspaceSwitcher(WayfireOutput *output);
diff --git a/src/panel/widgets/wp-mixer/wp-common.cpp b/src/panel/widgets/wp-mixer/wp-common.cpp
index 49462ee6..3ad248ed 100644
--- a/src/panel/widgets/wp-mixer/wp-common.cpp
+++ b/src/panel/widgets/wp-mixer/wp-common.cpp
@@ -176,10 +176,10 @@ void WpCommon::add_object_to_widget(WpPipewireObject *object, WayfireWpMixer *wi
     {
         widget->set_quick_target_from(control);
         // if the full mixer is not shown, change the popover child
-        if ((widget->popover->get_child() !=
-             &(widget->master_box)) && widget->popover->is_visible())
+        if ((widget->button->get_popup_child() !=
+             &(widget->master_box)) && widget->button->is_popup_visible())
         {
-            widget->popover->set_child(*widget->quick_target);
+            widget->button->set_popup_child(*widget->quick_target);
         }
 
         widget->update_icon();
@@ -275,21 +275,21 @@ void WpCommon::on_mixer_changed(gpointer mixer_api, guint id, gpointer data)
         update_icons();
 
         // if the mixer is currently being displayed, stop there
-        if ((widget->popover->get_child() ==
-             &(widget->master_box)) && widget->popover->is_visible())
+        if ((widget->button->get_popup_child() ==
+             &(widget->master_box)) && widget->button->is_popup_visible())
         {
             continue;
         }
 
         if (widget->quick_target &&
-            (!widget->popover->is_visible() ||
-             (widget->popover->get_child() != (WfWpControl*)&widget->quick_target)))
+            (!widget->button->is_popup_visible() ||
+             (widget->button->get_popup_child() != (WfWpControl*)&widget->quick_target)))
         {
             // put the quick_target in the popover and show
-            widget->popover->set_child(*widget->quick_target);
+            widget->button->set_popup_child(*widget->quick_target);
             if (widget->popup_on_change && change)
             {
-                widget->popover->popup();
+                widget->button->popup();
             }
         }
 
diff --git a/src/panel/widgets/wp-mixer/wp-common.hpp b/src/panel/widgets/wp-mixer/wp-common.hpp
index 2df289ba..34301ecc 100644
--- a/src/panel/widgets/wp-mixer/wp-common.hpp
+++ b/src/panel/widgets/wp-mixer/wp-common.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstddef>
 #include <memory>
 #include <vector>
 #include <wp/proxy-interfaces.h>
diff --git a/src/panel/widgets/wp-mixer/wp-mixer.cpp b/src/panel/widgets/wp-mixer/wp-mixer.cpp
index ea74f13a..00a7db43 100644
--- a/src/panel/widgets/wp-mixer/wp-mixer.cpp
+++ b/src/panel/widgets/wp-mixer/wp-mixer.cpp
@@ -3,6 +3,7 @@
 #include <wp/proxy.h>
 
 #include "wp-mixer.hpp"
+#include "wf-popover.hpp"
 #include "wf-wp-control.hpp"
 #include "icon-select.hpp"
 
@@ -11,7 +12,7 @@
 bool WayfireWpMixer::on_popover_timeout(int timer)
 {
     popover_timeout.disconnect();
-    popover->popdown();
+    button->popdown();
     return false;
 }
 
@@ -73,20 +74,20 @@ void WayfireWpMixer::reload_config()
         // unschedule hiding
         cancel_popover_timeout();
 
-        if ((popover->get_child() == (Gtk::Widget*)&master_box) && popover->is_visible())
+        if ((button->get_popup_child() == (Gtk::Widget*)&master_box) && button->is_popup_visible())
         {
-            popover->popdown();
+            button->popdown();
             return;
         }
 
-        if (!popover->is_visible())
+        if (!button->is_popup_visible())
         {
-            button->set_active(true);
+            button->popup();
         }
 
-        if (popover->get_child() != (Gtk::Widget*)&master_box)
+        if (button->get_popup_child() != (Gtk::Widget*)&master_box)
         {
-            popover->set_child(master_box);
+            button->set_popup_child(master_box);
             popover_timeout.disconnect();
         }
     };
@@ -100,20 +101,20 @@ void WayfireWpMixer::reload_config()
             return; // no quick_target means we have nothing to show
         }
 
-        if ((popover->get_child() == quick_target.get()) && popover->is_visible())
+        if ((button->get_popup_child() == quick_target.get()) && button->is_popup_visible())
         {
-            popover->popdown();
+            button->popdown();
             return;
         }
 
-        if (!popover->is_visible())
+        if (!button->is_popup_visible())
         {
-            button->set_active(true);
+            button->popup();
         }
 
-        if (popover->get_child() != quick_target.get())
+        if (button->get_popup_child() != quick_target.get())
         {
-            popover->set_child(*quick_target);
+            button->set_popup_child(*quick_target);
             popover_timeout.disconnect();
         }
     };
@@ -137,13 +138,13 @@ void WayfireWpMixer::reload_config()
         {
             // unschedule hiding
             cancel_popover_timeout();
-            if (popover->get_child() != (Gtk::Widget*)&master_box)
+            if (button->get_popup_child() != (Gtk::Widget*)&master_box)
             {
-                popover->set_child(master_box);
+                button->set_popup_child(master_box);
                 // popdown so that when the click is processed, the popover is down, and thus pops up
                 // not the prettiest result, as it visibly closes instead of just replacing, but i’m not sure
                 // how to make it better
-                button->set_active(false);
+                button->popdown();
             }
         });
     }
@@ -160,11 +161,11 @@ void WayfireWpMixer::reload_config()
                 return;
             }
 
-            if (popover->get_child() != quick_target.get())
+            if (button->get_popup_child() != quick_target.get())
             {
-                popover->set_child(*quick_target);
+                button->set_popup_child(*quick_target);
                 // same as above
-                button->set_active(false);
+                button->popdown();
             }
         });
     }
@@ -219,23 +220,18 @@ void WayfireWpMixer::init(Gtk::Box *container)
 {
     // sets up the "widget part"
 
-    button = std::make_unique<WayfireMenuButton>("panel");
+    button = std::make_unique<WayfireMenuWidget>("panel", "wp-mixer", "wp_mixer");
     button->add_css_class("widget-icon");
-    button->add_css_class("wp-mixer");
-    button->add_css_class("flat");
-    button->get_children()[0]->add_css_class("flat");
-    button->set_child(main_image);
+    button->append(main_image);
     button->show();
+    button->open_on(1);
     sinks_box.add_css_class("outputs");
     sources_box.add_css_class("inputs");
     streams_box.add_css_class("streams");
     out_in_wall.add_css_class("out-in");
     in_streams_wall.add_css_class("in-streams");
 
-    popover = button->get_popover();
-    popover->set_child(master_box);
-    popover->set_autohide(false);
-    popover->add_css_class("wp-mixer-popover");
+    button->set_popup_child(master_box);
 
     // scroll to change volume of the object targetted by the quick_target widget
     auto scroll_gesture = Gtk::EventControllerScroll::create();
@@ -318,7 +314,6 @@ void WayfireWpMixer::init(Gtk::Box *container)
 
     // add to the actual container
     container->append(*button);
-    button->set_child(main_image);
 
     // if there is no audio device nor application, the quick target will not be set
     // and the widget will apear empty. Calling this here to always have the OOR icon.
@@ -357,7 +352,6 @@ void WayfireWpMixer::set_quick_target_from(WfWpControl *from)
 WayfireWpMixer::~WayfireWpMixer()
 {
     WpCommon::get().rem_widget(this);
-    gtk_widget_unparent(GTK_WIDGET(popover->gobj()));
     popover_timeout.disconnect();
     volume_changed_signal.disconnect();
     left_conn.disconnect();
diff --git a/src/panel/widgets/wp-mixer/wp-mixer.hpp b/src/panel/widgets/wp-mixer/wp-mixer.hpp
index e4918e2d..fa7fba8f 100644
--- a/src/panel/widgets/wp-mixer/wp-mixer.hpp
+++ b/src/panel/widgets/wp-mixer/wp-mixer.hpp
@@ -54,8 +54,7 @@ class WayfireWpMixer : public WayfireWidget
     WfOption<bool> invert_scroll{"panel/wp_invert_scroll"};
     WfOption<bool> popup_on_change{"panel/wp_popup_on_change"};
 
-    std::unique_ptr<WayfireMenuButton> button;
-    Gtk::Popover *popover;
+    std::unique_ptr<WayfireMenuWidget> button;
 
     /*
      * the "quick_target" is the representation of the audio channel that shows it’s volume
diff --git a/src/util/wf-autohide-window.cpp b/src/util/wf-autohide-window.cpp
index 5031a98e..92dd0f81 100644
--- a/src/util/wf-autohide-window.cpp
+++ b/src/util/wf-autohide-window.cpp
@@ -1,5 +1,6 @@
 #include "wf-autohide-window.hpp"
 #include "wayfire-shell-unstable-v2-client-protocol.h"
+#include "wf-popover.hpp"
 
 #include <gtk4-layer-shell.h>
 #include <wf-shell-app.hpp>
@@ -15,6 +16,7 @@
 
 WayfireAutohidingWindow::WayfireAutohidingWindow(WayfireOutput *output,
     const std::string& section) :
+    force_show_popup{"panel/force_show_popup"},
     position{section + "/position"},
     y_position{WfOption<int>{section + "/autohide_duration"}},
     edge_offset{section + "/edge_offset"},
@@ -414,60 +416,82 @@ bool WayfireAutohidingWindow::update_margin()
     return false;
 }
 
-void WayfireAutohidingWindow::set_active_popover(WayfireMenuButton& button)
+bool WayfireAutohidingWindow::is_active_popover(WayfireMenuWidget& button)
 {
-    if (&button != this->active_button)
-    {
-        if (this->active_button)
-        {
-            this->popover_hide.disconnect();
-            this->active_button->set_active(false);
-            this->active_button->get_popover()->popdown();
-        }
+    return this->active_button == &button;
+}
 
+bool WayfireAutohidingWindow::has_active_popover()
+{
+    return this->active_button != nullptr;
+}
+
+void WayfireAutohidingWindow::set_active_popover(WayfireMenuWidget& button)
+{
+    if (!is_active_popover(button))
+    {
         this->active_button = &button;
-        this->popover_hide  =
-            this->active_button->m_popover.signal_hide().connect(
-                [this, &button] () { unset_active_popover(button); });
+    }
+
+    /* Set this panel to forcibly show over fullscreen apps */
+    if (force_show_popup.value())
+    {
+        gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
     }
 
     const bool should_grab_focus = this->active_button->is_keyboard_interactive();
+    if (should_grab_focus)
+    {
+        gtk_layer_set_keyboard_mode(this->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND);
+    } else
+    {
+        gtk_layer_set_keyboard_mode(this->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_NONE);
+    }
 
-    /*
-     *  if (should_grab_focus)
-     *  {
-     *   // First, set exclusive mode to grab input
-     *   gtk_layer_set_keyboard_mode(this->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE);
-     *   wl_surface_commit(get_wl_surface());
-     *
-     *   // Next, allow releasing of focus when clicking outside of the panel
-     *   gtk_layer_set_keyboard_mode(this->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND);
-     *  }
-     */
-    // TODO come back for intentional focus steal
-
-    this->active_button->set_has_focus(should_grab_focus);
     schedule_show(0);
 }
 
-void WayfireAutohidingWindow::unset_active_popover(WayfireMenuButton& button)
+void WayfireAutohidingWindow::unset_active_popover()
 {
-    if (!this->active_button || (&button != this->active_button))
+    if (this->active_button)
     {
-        return;
+        this->active_button = nullptr;
+        this->popover_hide.disconnect();
     }
 
-    this->active_button->set_has_focus(false);
-    this->active_button->set_active(false);
-    this->active_button = nullptr;
-    this->popover_hide.disconnect();
-
     gtk_layer_set_keyboard_mode(this->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_NONE);
 
     if (should_autohide())
     {
         schedule_hide(AUTOHIDE_HIDE_DELAY);
     }
+
+    WfOption<std::string> panel_layer{"panel/layer"};
+
+    if ((std::string)panel_layer == "overlay")
+    {
+        gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
+    }
+
+    if ((std::string)panel_layer == "top")
+    {
+        gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_TOP);
+    }
+
+    if ((std::string)panel_layer == "bottom")
+    {
+        gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_BOTTOM);
+    }
+
+    if ((std::string)panel_layer == "background")
+    {
+        gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_BACKGROUND);
+    }
+}
+
+WayfireMenuWidget*WayfireAutohidingWindow::get_active_popover()
+{
+    return this->active_button;
 }
 
 void WayfireAutohidingWindow::setup_autohide()
diff --git a/src/util/wf-autohide-window.hpp b/src/util/wf-autohide-window.hpp
index cd6cd6c5..9fce6dce 100644
--- a/src/util/wf-autohide-window.hpp
+++ b/src/util/wf-autohide-window.hpp
@@ -37,6 +37,8 @@ class WayfireAutohidingWindow : public Gtk::Window
     WayfireAutohidingWindow& operator =(const WayfireAutohidingWindow&) = delete;
     WayfireAutohidingWindow& operator =(WayfireAutohidingWindow&&) = delete;
 
+    WfOption<bool> force_show_popup;
+
     ~WayfireAutohidingWindow();
     wl_surface *get_wl_surface() const;
 
@@ -58,23 +60,20 @@ class WayfireAutohidingWindow : public Gtk::Window
      * Note that autohide margin isn't taken into account. */
     void set_auto_exclusive_zone(bool has_zone = false);
 
-    /**
-     * Set the currently active popover button.
-     * The lastly activated popover, if any, will be closed, in order to
-     * show this new one.
-     *
-     * In addition, if the window has an active popover, it will grab the
-     * keyboard input and deactivate the popover when the focus is lost.
-     */
-    void set_active_popover(WayfireMenuButton& button);
+    void set_active_popover(WayfireMenuWidget& button);
+    bool is_active_popover(WayfireMenuWidget& button);
+    bool has_active_popover();
+    void unset_active_popover();
 
-    /**
-     * No-op if the given popover is not the currently active popover.
-     *
-     * Unsets the currently active popover and reverses the effects of setting
-     * making it active with set_active_popover()
+    /*
+     * Get Active popover or null
      */
-    void unset_active_popover(WayfireMenuButton& popover);
+    WayfireMenuWidget *get_active_popover();
+
+    WayfireOutput *get_output()
+    {
+        return output;
+    }
 
   private:
     WayfireOutput *output;
@@ -120,7 +119,7 @@ class WayfireAutohidingWindow : public Gtk::Window
     void setup_hotspot();
 
     sigc::connection popover_hide;
-    WayfireMenuButton *active_button = nullptr;
+    WayfireMenuWidget *active_button = nullptr;
 };
 
 
diff --git a/src/util/wf-popover.cpp b/src/util/wf-popover.cpp
index 0a38af47..e2ca9242 100644
--- a/src/util/wf-popover.cpp
+++ b/src/util/wf-popover.cpp
@@ -1,67 +1,362 @@
 #include "wf-popover.hpp"
+#include "giomm/menumodel.h"
+#include "glib.h"
+#include "glibmm.h"
+#include "glibmm/main.h"
+#include "gtk/gtk.h"
+#include "gtkmm/eventcontrollermotion.h"
+#include "gtkmm/gestureclick.h"
+#include "gtkmm/widget.h"
 #include "wf-autohide-window.hpp"
+#include <cstddef>
+#include <iostream>
+#include <memory>
+#include <gtk4-layer-shell.h>
 
-WayfireMenuButton::WayfireMenuButton(const std::string& section) :
-    panel_position{section + "/position"}
+/* Helper to get panel from button. NULL if not added to one */
+WayfireAutohidingWindow *get_panel(Gtk::Widget *button)
 {
-    add_css_class("flat");
-    // m_popover.set_constrain_to(Gtk::POPOVER_CONSTRAINT_NONE);
+    auto window = button->get_root();
+    if (!window)
+    {
+        return NULL;
+    }
+
+    auto autohide_window = dynamic_cast<WayfireAutohidingWindow*>(window);
+    return autohide_window;
+}
+
+void WayfireMenuWidget::set_no_child()
+{
+    remove_css_class("with-content");
+    popover.popdown();
+    menu.popdown();
+    use_menu   = false;
+    use_widget = false;
+}
+
+void WayfireMenuWidget::set_menu_model(Glib::RefPtr<Gio::MenuModel> new_menu)
+{
+    add_css_class("with-content");
+    popover.popdown();
+    use_menu   = true;
+    use_widget = false;
+    menu.set_menu_model(new_menu);
+}
+
+void WayfireMenuWidget::popup()
+{
+    cancel_timer();
+    auto panel = get_panel(this);
+    if (!panel)
+    {
+        return;
+    }
 
-    auto cb = [=] ()
+    if (panel->is_active_popover(*this))
     {
-        // set_direction((std::string)panel_position == "top" ?
-        // Gtk::Arrow::DOWN : Gtk::Arrow::UP);
+        return;
+    }
 
-        this->unset_popover();
-        // m_popover.set_constrain_to(Gtk::POPOVER_CONSTRAINT_NONE);
-        set_popover(m_popover);
-    };
-    panel_position.set_callback(cb);
-    cb();
+    if (use_menu)
+    {
+        menu.popup();
+    } else if (use_widget)
+    {
+        if (fullscreen)
+        {
+            fullscreen->show();
+        } else
+        {
+            popover.popup();
+        }
+    } else
+    {
+        return;
+    }
 
-    m_popover.signal_show().connect([=]
+    add_css_class("selected");
+
+    panel->set_active_popover(*this);
+    popup_signal.emit();
+}
+
+void WayfireMenuWidget::popup_timed(int millis)
+{
+    /* Timed popup is assumed to not be a user action. Do not popup if a popup is already shown */
+    auto panel = get_panel(this);
+    if (!panel)
     {
-        set_active_on_window();
+        return;
+    }
+
+    if (panel->is_active_popover(*this))
+    {
+        /* If it is us and we've got a timer, reset timer */
+
+        if (timer_signal.connected())
+        {
+            set_timer(millis);
+        }
+
+        return;
+    }
+
+    if (panel->has_active_popover())
+    {
+        return;
+    }
+
+    popup();
+    set_timer(millis);
+}
+
+void WayfireMenuWidget::popdown()
+{
+    cancel_timer();
+    auto panel = get_panel(this);
+    if (!panel)
+    {
+        return;
+    }
+
+    remove_css_class("selected");
+    menu.popdown();
+    popover.popdown();
+    if (fullscreen)
+    {
+        fullscreen->hide();
+    }
+
+    if (!use_menu && !use_widget)
+    {
+        return;
+    }
+
+    popdown_signal.emit();
+    panel->unset_active_popover();
+}
+
+void WayfireMenuWidget::open_on(int button)
+{
+    if (click_signal)
+    {
+        click_signal.disconnect();
+    }
+
+    if (button < 0)
+    {
+        return;
+    }
+
+    auto click_gesture = Gtk::GestureClick::create();
+    click_gesture->set_button(button);
+    /* Action on release */
+    click_signal = click_gesture->signal_released().connect(
+        [=] (int, double, double)
+    {
+        toggle();
     });
+    add_controller(click_gesture);
+}
+
+WayfireMenuWidget::WayfireMenuWidget(const std::string& section, const std::string class_name,
+    const std::string option_name) :
+    panel_position{section + "/position"}, class_name(class_name)
+{
+    /* WayfireMenuWidget gets class name directly */
+    add_css_class(class_name);
+    add_css_class("wf-menu");
+    /* Add generic popover class to both */
+    popover.add_css_class("popover");
+    menu.add_css_class("popover");
+    /* Add specific popover class to both */
+    popover.add_css_class(class_name + "-popover");
+    menu.add_css_class(class_name + "-popover");
+
+    /* Scroller around widget popover for small screens */
+    popover.set_child(scroll);
+    scroll.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
+    scroll.set_propagate_natural_height(true);
+    scroll.set_propagate_natural_width(true);
+
+    gtk_widget_set_parent(GTK_WIDGET(popover.gobj()), GTK_WIDGET(this->gobj()));
+    gtk_widget_set_parent(GTK_WIDGET(menu.gobj()), GTK_WIDGET(this->gobj()));
+    /* Moved to another menu */
+    auto motion_gesture = Gtk::EventControllerMotion::create();
+    signals.push_back(motion_gesture->signal_enter().connect(
+        [=] (double, double)
+    {
+        if (!menus_motion.value())
+        {
+            return;
+        }
+
+        auto panel = get_panel(this);
+        if (panel)
+        {
+            /* Without contents, don't switch */
+            if (!use_menu && !use_widget)
+            {
+                return;
+            }
+
+            if (panel->has_active_popover() && !panel->is_active_popover(*this))
+            {
+                if (panel->get_active_popover()->timer_signal.connected())
+                {
+                    return;
+                }
+
+                panel->get_active_popover()->popdown();
+                popup();
+            }
+        }
+    }));
+    add_controller(motion_gesture);
+    signals.push_back(popover.signal_closed().connect([=] ()
+    {
+        popdown();
+    }));
+
+    signals.push_back(menu.signal_closed().connect([=] ()
+    {
+        popdown();
+    }));
+}
+
+/* Most cases use class and option named the same. But not all */
+WayfireMenuWidget::WayfireMenuWidget(const std::string& section, std::string name) :
+    WayfireMenuWidget(section, name, name)
+{}
+
+WayfireMenuWidget::~WayfireMenuWidget()
+{
+    for (auto signal : signals)
+    {
+        signal.disconnect();
+    }
+
+    timer_signal.disconnect();
+    click_signal.disconnect();
+
+    gtk_widget_unparent(GTK_WIDGET(popover.gobj()));
+    gtk_widget_unparent(GTK_WIDGET(menu.gobj()));
 }
 
-void WayfireMenuButton::set_keyboard_interactive(bool interactive)
+void WayfireMenuWidget::set_keyboard_interactive(bool interactive)
 {
     this->interactive = interactive;
 }
 
-bool WayfireMenuButton::is_keyboard_interactive() const
+bool WayfireMenuWidget::is_keyboard_interactive() const
 {
     return this->interactive;
 }
 
-void WayfireMenuButton::set_has_focus(bool focus)
+void WayfireMenuWidget::set_active_on_window()
 {
-    this->has_focus = focus;
+    auto panel = get_panel(this);
+    if (panel)
+    {
+        panel->set_active_popover(*this);
+    }
 }
 
-bool WayfireMenuButton::is_popover_focused() const
+void WayfireMenuWidget::set_popup_child(Gtk::Widget & widget)
 {
-    return this->has_focus;
+    add_css_class("with-content");
+    menu.popdown();
+    use_menu   = false;
+    use_widget = true;
+    scroll.set_child(widget);
 }
 
-void WayfireMenuButton::set_active_on_window()
+Gtk::Widget*WayfireMenuWidget::get_popup_child()
 {
-    auto window = this->get_parent();
-    while (window && window->get_parent())
+    return popover.get_child();
+}
+
+void WayfireMenuWidget::toggle()
+{
+    Glib::signal_idle().connect([=] ()
     {
-        window = window->get_parent();
+        auto panel = get_panel(this);
+        if (panel)
+        {
+            WayfireMenuWidget *popover = panel->get_active_popover();
+            if (popover == NULL)
+            {
+                popup();
+            } else
+            {
+                popover->popdown();
+            }
+        }
+
+        return G_SOURCE_REMOVE;
+    });
+}
+
+bool WayfireMenuWidget::is_popup_visible()
+{
+    auto panel = get_panel(this);
+    if (panel)
+    {
+        return panel->get_active_popover() == this;
     }
 
-    auto autohide_window = dynamic_cast<WayfireAutohidingWindow*>(window);
-    if (autohide_window)
+    return false;
+}
+
+void WayfireMenuWidget::set_fullscreen(bool fs)
+{
+    auto panel = get_panel(this);
+    if (!panel)
+    {
+        return;
+    }
+
+    if (fs && (fullscreen == nullptr))
+    {
+        gtk_popover_set_child(popover.gobj(), nullptr);
+
+        /* Prepare fullscreen layer */
+        fullscreen = std::make_shared<Gtk::Window>();
+        fullscreen->add_css_class(class_name + "-fullscreen-popover");
+        fullscreen->add_css_class(class_name + "-popover");
+        fullscreen->add_css_class("fullscreen-popover");
+        gtk_layer_init_for_window(fullscreen->gobj());
+        gtk_layer_set_namespace(fullscreen->gobj(), "panelmenu");
+        gtk_layer_set_anchor(fullscreen->gobj(), GTK_LAYER_SHELL_EDGE_TOP, true);
+        gtk_layer_set_anchor(fullscreen->gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, true);
+        gtk_layer_set_anchor(fullscreen->gobj(), GTK_LAYER_SHELL_EDGE_LEFT, true);
+        gtk_layer_set_anchor(fullscreen->gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, true);
+        gtk_layer_set_layer(fullscreen->gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
+        gtk_layer_set_keyboard_mode(fullscreen->gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE);
+        gtk_layer_set_monitor(fullscreen->gobj(), panel->get_output()->monitor->gobj());
+
+        fullscreen->set_child(scroll);
+    } else if (!fs && fullscreen)
     {
-        autohide_window->set_active_popover(*this);
+        gtk_window_set_child(fullscreen->gobj(), nullptr);
+        popover.set_child(scroll);
+        fullscreen->close();
+        fullscreen = nullptr;
     }
 }
 
-void WayfireMenuButton::grab_focus()
+void WayfireMenuWidget::cancel_timer()
+{
+    timer_signal.disconnect();
+}
+
+void WayfireMenuWidget::set_timer(int millis)
 {
-    set_keyboard_interactive();
-    set_active_on_window(); // actually grab focus
+    timer_signal.disconnect();
+    timer_signal = Glib::signal_timeout().connect([=]
+    {
+        popdown();
+        return G_SOURCE_REMOVE;
+    }, millis);
 }
diff --git a/src/util/wf-popover.hpp b/src/util/wf-popover.hpp
index 1bd416c8..a903d93a 100644
--- a/src/util/wf-popover.hpp
+++ b/src/util/wf-popover.hpp
@@ -1,32 +1,86 @@
 #pragma once
 
-#include <gtkmm/menubutton.h>
+#include "giomm/menumodel.h"
+#include "glibmm/refptr.h"
+#include "gtkmm/scrolledwindow.h"
+#include <gtkmm/widget.h>
+#include <sigc++/connection.h>
+#include <sigc++/signal.h>
+#include <gtkmm/box.h>
 #include <gtkmm/popover.h>
+#include <gtkmm/popovermenu.h>
+#include <memory>
+#include <vector>
 #include <wf-option-wrap.hpp>
 
+using type_signal_simple = sigc::signal<void (void)>;
+
 /**
- * A button which shows a popover on click. It adjusts the popup position
+ * A button which shows a popup on click. It adjusts the popup position
  * automatically based on panel position (valid values are "top" and "bottom")
  */
-class WayfireMenuButton : public Gtk::MenuButton
+class WayfireMenuWidget : public Gtk::Box
 {
+  private:
+    Gtk::ScrolledWindow scroll;
+    Gtk::Popover popover;
+    Gtk::PopoverMenu menu;
+    Glib::RefPtr<Gtk::Window> fullscreen;
+    bool use_menu = false, use_widget = false;
     bool interactive = true;
-    bool has_focus   = false;
     WfOption<std::string> panel_position;
 
     /* Make the menu button active on its AutohideWindow */
     void set_active_on_window();
 
     friend class WayfireAutohidingWindow;
-    /* Set the has_focus property */
-    void set_has_focus(bool focus);
+
+    sigc::connection click_signal, timer_signal;
+    std::vector<sigc::connection> signals;
+    std::string class_name;
+
+    void cancel_timer();
+    void set_timer(int millis);
+
+    type_signal_simple popup_signal, popdown_signal;
+    WfOption<bool> menus_motion{"panel/menus_change_motion"};
 
   public:
-    Gtk::Popover m_popover;
 
-    WayfireMenuButton(const std::string& config_section);
-    virtual ~WayfireMenuButton()
-    {}
+    void set_no_child();
+    void set_menu_model(Glib::RefPtr<Gio::MenuModel> menu);
+    void set_child(Gtk::Widget & widget);
+    Gtk::Widget *get_child();
+
+    void popup();
+    void popup_timed(int millis);
+    void popdown();
+
+    WayfireMenuWidget(const std::string& config_section,
+        const std::string name);
+    WayfireMenuWidget(const std::string& config_section,
+        const std::string css_name,
+        const std::string option_name);
+    ~WayfireMenuWidget();
+
+    /* Called when the popup is shown */
+    type_signal_simple signal_popup()
+    {
+        return popup_signal;
+    }
+
+    /* Called when the popup is hidden */
+    type_signal_simple signal_popdown()
+    {
+        return popdown_signal;
+    }
+
+    /**
+     * Set popup child
+     */
+    void set_popup_child(Gtk::Widget & child);
+
+    Gtk::Widget *get_popup_child();
 
     /**
      * Set whether the popup should grab input focus when opened
@@ -37,14 +91,13 @@ class WayfireMenuButton : public Gtk::MenuButton
     /** @return Whether the menu button interacts with the keyboard */
     bool is_keyboard_interactive() const;
 
-    /** @return Whether the popover currently has keyboard focus */
-    bool is_popover_focused() const;
+    /* Toggle the popup state of the connected popup */
+    void toggle();
+    /* Returns true if this is the open popup for this panel */
+    bool is_popup_visible();
 
-    /**
-     * Grab the keyboard focus.
-     * Also sets the popover to keyboard interactive.
-     *
-     * NOTE: this works only if the popover was already opened.
-     */
-    void grab_focus();
+    /* Use a specific mouse button to open menu. Skip this if you're handling presses in-widget. If button < 0
+     * then this callback is removed  */
+    void open_on(int button);
+    void set_fullscreen(bool fs);
 };