diff --git a/docs/installation.md b/docs/installation.md
index 7eb4aa10..74d033b7 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -27,6 +27,18 @@ brew update
 brew install hidapi gtk+3 pygobject3
 ```
 
+### Optional: Set up macOS launcher
+* Option A (recommended): Configure a LaunchAgent to automatically start Solaar and keep it running in the background.
+It will also automatically restart Solaar if it crashed or closed.
+```
+bash <(curl -fsSL https://raw.githubusercontent.com/pwr-Solaar/Solaar/refs/heads/master/tools/create-macos-app.sh)
+```
+* Option B: Create Solaar.app launcher in /Applications.
+It can be added to Login Items to start on login, but it will not automatically recover on crashes.
+```
+bash <(curl -fsSL https://raw.githubusercontent.com/pwr-Solaar/Solaar/refs/heads/master/tools/create-macos-launchagent.sh)
+```
+
 # Installating from GitHub
 
 ## Downloading
diff --git a/tools/create-macos-app.sh b/tools/create-macos-app.sh
new file mode 100755
index 00000000..6109768c
--- /dev/null
+++ b/tools/create-macos-app.sh
@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+# Helper to build a minimal macOS .app wrapper for Solaar.
+set -euo pipefail
+
+APP_ROOT=${1:-/Applications/Solaar.app}
+SOLAAR_PATH=${SOLAAR_PATH:-solaar}
+SOLAAR_RESOLVED_PATH=$(command -v "${SOLAAR_PATH}" 2>/dev/null || echo "")
+if [ -z "${SOLAAR_RESOLVED_PATH}" ]; then
+    echo "Error: '${SOLAAR_PATH}' not found" >&2
+    exit 1
+fi
+ICON_SOURCE=${ICON_SOURCE:-share/solaar/icons/solaar.svg}
+
+case "${APP_ROOT}" in
+    ""|"/"|".")
+        echo "Error: Refusing to create app bundle at unsafe location: \"${APP_ROOT}\"" >&2
+        exit 1
+        ;;
+esac
+
+echo "Creating Solaar app bundle at ${APP_ROOT}"
+rm -rf "${APP_ROOT}"
+
+APP_CONTENTS="${APP_ROOT}/Contents"
+MACOS_DIR="${APP_CONTENTS}/MacOS"
+RESOURCES_DIR="${APP_CONTENTS}/Resources"
+
+mkdir -p "${MACOS_DIR}" "${RESOURCES_DIR}"
+
+WRAPPER="${MACOS_DIR}/solaar-wrapper"
+cat > "${WRAPPER}" <<EOF
+#!/usr/bin/env bash
+set -euo pipefail
+
+# When launched via 'Solaar.app', macOS applies .app bundle restrictions
+# that may prevent GTK from creating a tray icon properly.
+# Workaround: Launch solaar in a detached background process
+
+# NOTE: macOS Python always uses Python.app which shows a Dock icon
+# LSUIElement=true in Info.plist would have hidden it, but Python.app has its own Info.plist
+# that overrides ours. This is a limitation of Python on macOS.
+
+if [[ "\${SOLAAR_RELAUNCHED:-}" != "1" ]]; then
+    # First invocation from .app bundle - relaunch detached
+    export SOLAAR_RELAUNCHED=1
+    nohup "\$0" "\$@" >/dev/null 2>&1 &
+    exit 0
+fi
+
+# Second invocation - now detached, exec solaar normally
+exec "${SOLAAR_RESOLVED_PATH}" "\$@"
+EOF
+chmod +x "${WRAPPER}"
+
+HAVE_ICON=0
+if command -v sips >/dev/null 2>&1 && command -v iconutil >/dev/null 2>&1 && [[ -f "${ICON_SOURCE}" ]]; then
+    TMP_DIR=$(mktemp -d /tmp/solaar-icon.XXXXXX)
+    TMP_ICONSET="${TMP_DIR}/solaar.iconset"
+    mkdir -p "${TMP_ICONSET}"
+    trap 'rm -rf "${TMP_DIR}"' EXIT
+    for SIZE in 16 32 64 128 256 512; do
+        sips -s format png -z "${SIZE}" "${SIZE}" "${ICON_SOURCE}" --out "${TMP_ICONSET}/icon_${SIZE}x${SIZE}.png" >/dev/null
+        DOUBLE=$((SIZE * 2))
+        sips -s format png -z "${DOUBLE}" "${DOUBLE}" "${ICON_SOURCE}" --out "${TMP_ICONSET}/icon_${SIZE}x${SIZE}@2x.png" >/dev/null
+    done
+    if iconutil -c icns "${TMP_ICONSET}" -o "${RESOURCES_DIR}/solaar.icns" >/dev/null 2>&1; then
+        HAVE_ICON=1
+        echo "Added icon from ${ICON_SOURCE}"
+    else
+        echo "Warning: Failed to create solaar.icns – continuing without custom icon" >&2
+    fi
+    rm -rf "${TMP_DIR}"
+    trap - EXIT
+else
+    echo "Skipping icon generation (requires sips, iconutil, and ${ICON_SOURCE})"
+fi
+
+{
+cat <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleExecutable</key>
+    <string>solaar-wrapper</string>
+    <key>CFBundleIdentifier</key>
+    <string>io.github.pwr-solaar.solaar</string>
+    <key>CFBundleName</key>
+    <string>Solaar</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+    <key>NSInputMonitoringUsageDescription</key>
+    <string>Solaar needs to access input devices to configure and monitor your Logitech keyboards, mice, and other peripherals.</string>
+    <key>LSUIElement</key>
+    <false/>
+EOF
+if [[ ${HAVE_ICON} -eq 1 ]]; then
+cat <<'EOF'
+    <key>CFBundleIconFile</key>
+    <string>solaar.icns</string>
+EOF
+fi
+cat <<'EOF'
+</dict>
+</plist>
+EOF
+} > "${APP_CONTENTS}/Info.plist"
+
+echo "Solaar app bundle created at ${APP_ROOT}"
+echo ""
+echo "To install the LaunchAgent for automatic startup and keep-alive execute:"
+echo "  bash tools/create-macos-launchagent.sh"
diff --git a/tools/create-macos-launchagent.sh b/tools/create-macos-launchagent.sh
new file mode 100755
index 00000000..eb34967c
--- /dev/null
+++ b/tools/create-macos-launchagent.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Helper to install a LaunchAgent for Solaar to keep it running in the background.
+set -euo pipefail
+
+SOLAAR_PATH=${SOLAAR_PATH:-solaar}
+SOLAAR_RESOLVED_PATH=$(command -v "${SOLAAR_PATH}" 2>/dev/null || echo "")
+if [ -z "${SOLAAR_RESOLVED_PATH}" ]; then
+    echo "Error: '${SOLAAR_PATH}' not found" >&2
+    exit 1
+fi
+
+LAUNCH_AGENT_DIR="${HOME}/Library/LaunchAgents"
+LAUNCH_AGENT_PLIST="${LAUNCH_AGENT_DIR}/io.github.pwr-solaar.solaar.plist"
+
+mkdir -p "${LAUNCH_AGENT_DIR}"
+
+echo "Creating LaunchAgent to keep Solaar running..."
+
+# Unload if already loaded (suppress errors)
+launchctl unload "${LAUNCH_AGENT_PLIST}" 2>/dev/null || true
+
+cat > "${LAUNCH_AGENT_PLIST}" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>io.github.pwr-solaar.solaar</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${SOLAAR_RESOLVED_PATH}</string>
+        <string>--window=hide</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>${HOME}/Library/Logs/solaar.log</string>
+    <key>StandardErrorPath</key>
+    <string>${HOME}/Library/Logs/solaar.error.log</string>
+    <key>ProcessType</key>
+    <string>Background</string>
+</dict>
+</plist>
+EOF
+
+launchctl load "${LAUNCH_AGENT_PLIST}"
+
+echo "LaunchAgent created at ${LAUNCH_AGENT_PLIST}"
+echo ""
+echo "To disable automatic startup:"
+echo "  launchctl unload \"${LAUNCH_AGENT_PLIST}\""
+echo ""
+echo "To re-enable automatic startup:"
+echo "  launchctl load \"${LAUNCH_AGENT_PLIST}\""
+echo ""
+echo "To start Solaar:"
+echo "  launchctl start io.github.pwr-solaar.solaar"
+echo ""
+echo "To stop Solaar:"
+echo "  launchctl stop io.github.pwr-solaar.solaar"
+echo ""
+echo "Logs will be written to:"
+echo "  ${HOME}/Library/Logs/solaar.log"
+echo "  ${HOME}/Library/Logs/solaar.error.log"