From 2fc48f75ffea465b7d194860b0004631b7ce2f1f Mon Sep 17 00:00:00 2001
From: jisangs <jisangs@gmail.com>
Date: Sun, 17 May 2026 23:18:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=B6=95=ED=82=A4=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD:=20S=20->=20Cmd=20+=20S,=20O=20->=20Cmd=20+=20O?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGENTS.md                |  4 ++--
 src/renderer/index.html  |  4 ++--
 src/renderer/keyboard.js | 11 +++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index f4401b2..b323d6b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -112,8 +112,8 @@ Prefer narrow utility modules (`utils/file-names.js`, `utils/dom.js`) over broad
 - `sortMode` — `'name'` | `'date'` | `null`
 
 **Keyboard shortcuts** (모두 `e.code` 기준 — 한글 입력 모드에서도 동작):
-- `O` — 폴더 열기
-- `S` — 이름 변경 실행
+- `Cmd+O` — 폴더 열기
+- `Cmd+S` — 이름 변경 실행
 - `A` — 전체 선택
 - `Cmd+Z` — Undo (되돌리기)
 - `Cmd+Shift+Z` — Redo (다시하기)
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 5467128..8981ef2 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -16,8 +16,8 @@
 
   <aside>
     <nav class="sidebar-nav">
-      <button class="btn btn-warning" id="btn-open">폴더 열기 (O)</button>
-      <button class="btn btn-success" id="btn-rename" disabled>이름 변경 실행 (S)</button>
+      <button class="btn btn-warning" id="btn-open">폴더 열기 (⌘O)</button>
+      <button class="btn btn-success" id="btn-rename" disabled>이름 변경 실행 (⌘S)</button>
     </nav>
     <section class="file-explorer">
       <!-- 추후 구현 -->
diff --git a/src/renderer/keyboard.js b/src/renderer/keyboard.js
index 10811f0..19054b6 100644
--- a/src/renderer/keyboard.js
+++ b/src/renderer/keyboard.js
@@ -10,12 +10,15 @@ export function initKeyboardShortcuts({
 }) {
   document.addEventListener('keydown', (e) => {
     if (hasOpenModal()) return;
-    if (isEditableTarget(e.target)) return;
+    const isMetaOpenOrSave = e.metaKey && (e.code === 'KeyO' || e.code === 'KeyS');
+    if (isEditableTarget(e.target) && !isMetaOpenOrSave) return;
 
-    if (e.code === 'KeyO') {
+    if (e.metaKey && e.code === 'KeyO') {
+      e.preventDefault();
       btnOpen.click();
-    } else if (e.code === 'KeyS' && !btnRename.disabled) {
-      btnRename.click();
+    } else if (e.metaKey && e.code === 'KeyS') {
+      e.preventDefault();
+      if (!btnRename.disabled) btnRename.click();
     } else if (e.code === 'KeyA') {
       selectAll();
       refreshSelection();