diff --git a/Cargo.lock b/Cargo.lock
index 0f6b3dc..966e2c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1457,7 +1457,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#546a6c45210574caed9a3e51446aa8ad622d3627"
+source = "git+https://github.com/pop-os/cosmic-panel#029400b2b447d9d31f1a772d7f6f0d5eed2ea21e"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -8908,7 +8908,7 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 [[package]]
 name = "xdg-shell-wrapper-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#546a6c45210574caed9a3e51446aa8ad622d3627"
+source = "git+https://github.com/pop-os/cosmic-panel#029400b2b447d9d31f1a772d7f6f0d5eed2ea21e"
 dependencies = [
  "serde",
  "wayland-protocols-wlr",
diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs
index bce638f..ea54337 100644
--- a/cosmic-settings/src/pages/desktop/panel/inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/inner.rs
@@ -118,7 +118,7 @@ pub(crate) fn behavior_and_position<
                 .title(&section.title)
                 .add(
                     settings::item::builder(&descriptions[autohide_label])
-                        .toggler(panel_config.autohide.is_some(), Message::AutoHidePanel),
+                        .toggler(panel_config.autohide_enabled(), Message::AutoHidePanel),
                 )
                 .add(settings::item(
                     &descriptions[position],
@@ -542,18 +542,10 @@ impl PageInner {
             Message::AutoHidePanel(enabled) => {
                 if enabled {
                     _ = panel_config.set_exclusive_zone(helper, false);
-                    _ = panel_config.set_autohide(
-                        helper,
-                        Some(AutoHide {
-                            wait_time: 1000,
-                            transition_time: 200,
-                            handle_size: 4,
-                            unhide_delay: 200,
-                        }),
-                    );
+                    _ = panel_config.set_autohide(helper, AutoHide::OnOverlap);
                 } else {
                     _ = panel_config.set_exclusive_zone(helper, true);
-                    _ = panel_config.set_autohide(helper, None);
+                    _ = panel_config.set_autohide(helper, AutoHide::Never);
                 }
             }
             Message::PanelAnchor(i) => {