diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 08e1ad2b..8fe7f694 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -12,10 +12,14 @@ use wgui::{
     widget::EventResult,
 };
 
-use crate::{backend::task::ManagerTask, state::AppState, windowing::OverlaySelector};
+use crate::{
+    backend::task::{ManagerTask, TaskType},
+    state::AppState,
+    windowing::OverlaySelector,
+};
 
 #[cfg(feature = "wayvr")]
-use crate::backend::{task::TaskType, wayvr::WayVRAction};
+use crate::backend::wayvr::WayVRAction;
 
 use super::helper::read_label_from_pipe;
 
@@ -40,8 +44,8 @@ pub(super) fn setup_custom_button<S: 'static>(
         };
 
         let callback: EventCallback<AppState, S> = match command {
+            #[cfg(feature = "wayvr")]
             "::DashToggle" => Box::new(move |_common, _data, app, _| {
-                #[cfg(feature = "wayvr")]
                 app.tasks
                     .enqueue(TaskType::WayVR(WayVRAction::ToggleDashboard));
                 Ok(EventResult::Consumed)
diff --git a/wlx-overlay-s/src/overlays/edit/mod.rs b/wlx-overlay-s/src/overlays/edit/mod.rs
index b9503511..a1456e20 100644
--- a/wlx-overlay-s/src/overlays/edit/mod.rs
+++ b/wlx-overlay-s/src/overlays/edit/mod.rs
@@ -15,20 +15,21 @@ use wgui::{
     widget::EventResult,
 };
 
-#[cfg(feature = "wayvr")]
-use crate::{backend::task::TaskType, windowing::OverlaySelector};
 use crate::{
-    backend::{input::HoverResult, task::TaskContainer},
-    gui::panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS},
+    backend::{
+        input::HoverResult,
+        task::{TaskContainer, TaskType},
+    },
+    gui::panel::{button::BUTTON_EVENTS, GuiPanel, NewGuiPanelParams, OnCustomAttribFunc},
     overlays::edit::{
         lock::InteractLockHandler, pos::PositioningHandler, tab::ButtonPaneTabSwitcher,
     },
     state::AppState,
     subsystem::hid::WheelDelta,
     windowing::{
-        OverlayID,
         backend::{DummyBackend, OverlayBackend, OverlayEventData, RenderResources, ShouldRender},
         window::OverlayWindowConfig,
+        OverlayID, OverlaySelector,
     },
 };