diff --git a/app/gui/view/graph-editor/src/builtin/visualization/native/text_visualization.rs b/app/gui/view/graph-editor/src/builtin/visualization/native/text_visualization.rs
index b75c0bbb22b..ac8ce22dd45 100644
--- a/app/gui/view/graph-editor/src/builtin/visualization/native/text_visualization.rs
+++ b/app/gui/view/graph-editor/src/builtin/visualization/native/text_visualization.rs
@@ -165,8 +165,8 @@ impl<T: 'static> Model<T> {
         self.root.add_child(&self.scroll_bar_vertical);
         self.scroll_bar_vertical.set_rotation_z(-90.0_f32.to_radians());
 
-        self.app.display.default_scene.layers.above_nodes_text.add(&self.scroll_bar_horizontal);
-        self.app.display.default_scene.layers.above_nodes_text.add(&self.scroll_bar_vertical);
+        self.app.display.default_scene.layers.main.add(&self.scroll_bar_horizontal);
+        self.app.display.default_scene.layers.main.add(&self.scroll_bar_vertical);
     }
 
     fn set_size(&self, size: Vector2) {
diff --git a/app/gui/view/graph-editor/src/component/visualization/container.rs b/app/gui/view/graph-editor/src/component/visualization/container.rs
index 04d8d617515..527195e05db 100644
--- a/app/gui/view/graph-editor/src/component/visualization/container.rs
+++ b/app/gui/view/graph-editor/src/component/visualization/container.rs
@@ -291,6 +291,7 @@ impl ContainerModel {
 
     fn init(self) -> Self {
         self.display_object.add_child(&self.drag_root);
+        self.scene.layers.above_nodes.add(&self.action_bar);
 
         self.update_shape_sizes();
         self.init_corner_roundness();
diff --git a/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs b/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs
index 7a7d10f236d..bb62fcc71b0 100644
--- a/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs
+++ b/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs
@@ -269,8 +269,6 @@ impl Model {
         let icons = Icons::new();
         let shapes = compound::events::MouseEvents::default();
 
-        app.display.default_scene.layers.below_main.add(&hover_area);
-        app.display.default_scene.layers.below_main.add(&background);
         app.display.default_scene.layers.above_nodes.add(&icons);
 
         shapes.add_sub_shape(&hover_area);
diff --git a/app/gui/view/graph-editor/src/component/visualization/container/visualization_chooser.rs b/app/gui/view/graph-editor/src/component/visualization/container/visualization_chooser.rs
index 1ab68cafcf1..d7dea48fcca 100644
--- a/app/gui/view/graph-editor/src/component/visualization/container/visualization_chooser.rs
+++ b/app/gui/view/graph-editor/src/component/visualization/container/visualization_chooser.rs
@@ -60,7 +60,7 @@ struct Model {
 impl Model {
     pub fn new(app: &Application, registry: visualization::Registry) -> Self {
         let selection_menu = drop_down_menu::DropDownMenu::new(app);
-        app.display.default_scene.layers.below_main.add(&selection_menu);
+        app.display.default_scene.layers.above_nodes.add(&selection_menu);
         Self { selection_menu, registry }
     }
 
diff --git a/lib/rust/ensogl/component/list-view/src/entry/list.rs b/lib/rust/ensogl/component/list-view/src/entry/list.rs
index b762b5e6fff..4cf47d7a840 100644
--- a/lib/rust/ensogl/component/list-view/src/entry/list.rs
+++ b/lib/rust/ensogl/component/list-view/src/entry/list.rs
@@ -84,7 +84,8 @@ impl<E, P: Default> ListData<E, P> {
         let entry_params = default();
         let display_object = display::object::Instance::new();
         let provider = default();
-        let label_layer = Rc::new(RefCell::new(app.display.default_scene.layers.label.downgrade()));
+        let label_layer =
+            Rc::new(RefCell::new(app.display.default_scene.layers.above_nodes_text.downgrade()));
         Self { app, display_object, entries, entries_range, entry_params, provider, label_layer }
     }
 }