diff --git a/assets/icons/modify_setbylayer.svg b/assets/icons/modify_setbylayer.svg
new file mode 100644
index 000000000..9ce5827de
--- /dev/null
+++ b/assets/icons/modify_setbylayer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#B4B6B9" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18M3 12h18M3 18h18"/><path stroke="#6DB7ED" d="m8 3-3 3 3 3m8 0 3 3-3 3m-8 0-3 3 3 3"/></svg>
diff --git a/src/app/commands/styleprops.rs b/src/app/commands/styleprops.rs
index b99da19b4..372464252 100644
--- a/src/app/commands/styleprops.rs
+++ b/src/app/commands/styleprops.rs
@@ -646,6 +646,13 @@ impl OpenCADStudio {
             // Resets the selected entities' direct property overrides back to
             // ByLayer so they follow their layer again.
             "SETBYLAYER" => {
+                if self.tabs[i].scene.selected.is_empty() {
+                    use crate::modules::draw::select::SelectObjectsCommand;
+                    let selection = SelectObjectsCommand::new("SETBYLAYER");
+                    self.command_line.push_info(&selection.prompt());
+                    self.tabs[i].active_cmd = Some(Box::new(selection));
+                    return Some(self.finish_dispatch(cmd));
+                }
                 let handles: Vec<_> = self.tabs[i]
                     .scene
                     .selected_entities()
diff --git a/src/ui/ribbon/modify_tools/01_setbylayer.rs b/src/ui/ribbon/modify_tools/01_setbylayer.rs
new file mode 100644
index 000000000..953ee34ed
--- /dev/null
+++ b/src/ui/ribbon/modify_tools/01_setbylayer.rs
@@ -0,0 +1,6 @@
+Tool {
+    command: "SETBYLAYER",
+    label: "Set to ByLayer",
+    icon: include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/icons/modify_setbylayer.svg")),
+    options: &[],
+}