diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue
index 09d4497..0b65808 100644
--- a/src/views/board/BoardView.vue
+++ b/src/views/board/BoardView.vue
@@ -482,10 +482,10 @@
         const isUnknown = unknown?.unknown ?? false;
 
         if (isUnknown) {
-            togglePassword('edit');
             closeAllEditTextareas();
             closeAllPasswordAreas();
             activeCommentBtnClass();
+            togglePassword('edit');
         } else {
             router.push({ name: 'BoardEdit', params: { id: currentBoardId.value } });
         }
@@ -653,11 +653,9 @@
         if (lastClickedButton.value === button) {
             isPassword.value = !isPassword.value;
             boardPasswordAlert.value = '';
-            lastClickedButton.value = '';
             acitveButtonType();
         } else {
             isPassword.value = true;
-            lastClickedButton.value = button;
 
             if (button == 'edit') {
                 acitveButtonType(1);
@@ -671,23 +669,23 @@
 
     // 선택한 게시글 버튼 핸들링(수정, 삭제 버튼)
     const acitveButtonType = type => {
-        //closeAllEditTextareas(); //다른 모든 텍스트 에디터 비활성화
-        //inActiveCommentButtonClass(); // 댓글 버튼 비활성화
-
         // 수정
         if (type == 1) {
             isEditPushed.value = true;
             isDeletePushed.value = false;
+            lastClickedButton.value = 'edit';
 
             // 삭제
         } else if (type == 2) {
             isEditPushed.value = false;
             isDeletePushed.value = true;
+            lastClickedButton.value = 'delete';
 
             // 비활성화
         } else {
             isEditPushed.value = false;
             isDeletePushed.value = false;
+            lastClickedButton.value = '';
         }
     };