diff --git a/apps/client/src/widgets/collections/board/index.css b/apps/client/src/widgets/collections/board/index.css
index dc1d2f10d..c620ab0bc 100644
--- a/apps/client/src/widgets/collections/board/index.css
+++ b/apps/client/src/widgets/collections/board/index.css
@@ -154,6 +154,8 @@
 .board-view-container .board-note.editing {
   box-shadow: 2px 4px 8px rgba(0, 0, 0, 0.35);
   border-color: var(--main-text-color);
+  display: flex;
+  align-items: center;
 }
 
 .board-view-container .board-note.editing input {
diff --git a/apps/client/src/widgets/collections/board/index.tsx b/apps/client/src/widgets/collections/board/index.tsx
index b9a59a259..13e15db5e 100644
--- a/apps/client/src/widgets/collections/board/index.tsx
+++ b/apps/client/src/widgets/collections/board/index.tsx
@@ -373,6 +373,7 @@ function Card({
     isDragging: boolean
 }) {
     const { branchIdToEdit } = useContext(BoardViewContext);
+    const isEditing = branch.branchId === branchIdToEdit;
     const colorClass = note.getColorClass() || '';
 
     const handleDragStart = useCallback((e: DragEvent) => {
@@ -391,17 +392,15 @@ function Card({
 
     return (
         <div
-            className={`board-note ${colorClass} ${isDragging ? 'dragging' : ''}`}
+            className={`board-note ${colorClass} ${isDragging ? 'dragging' : ''} ${isEditing ? "editing" : ""}`}
             draggable="true"
             onDragStart={handleDragStart}
             onDragEnd={handleDragEnd}
             onContextMenu={handleContextMenu}
         >
-            {branch.branchId !== branchIdToEdit ? (
-                <>
-                    <span class={`icon ${note.getIcon()}`} />
-                    {note.title}
-                </>
+            <span class={`icon ${note.getIcon()}`} />
+            {!isEditing ? (
+                <>{note.title}</>
             ) : (
                 <FormTextBox
                     value={note.title}