diff --git a/admin-lehrer/components/grid-editor/GridTable.tsx b/admin-lehrer/components/grid-editor/GridTable.tsx
index 14963af..96cbcd5 100644
--- a/admin-lehrer/components/grid-editor/GridTable.tsx
+++ b/admin-lehrer/components/grid-editor/GridTable.tsx
@@ -504,62 +504,71 @@ export function GridTable({
                         />
                       )}
                       {/* Per-word colored display when not editing */}
-                      {hasColoredWords && !isSelected ? (
-                        <div
-                          className={`w-full px-2 cursor-text truncate ${isBold ? 'font-bold' : 'font-normal'}`}
-                          onClick={(e) => {
-                            if ((e.metaKey || e.ctrlKey) && onToggleCellSelection) {
-                              onToggleCellSelection(cellId)
-                            } else {
-                              onSelectCell(cellId)
-                              setTimeout(() => document.getElementById(`cell-${cellId}`)?.focus(), 0)
-                            }
-                          }}
-                        >
-                          {cell!.word_boxes!.map((wb, i) => (
-                            <span
-                              key={i}
-                              style={
-                                wb.color_name && wb.color_name !== 'black'
-                                  ? { color: wb.color }
-                                  : undefined
-                              }
+                      {(() => {
+                        const cellText = cell?.text ?? ''
+                        const isMultiLine = cellText.includes('\n')
+                        if (hasColoredWords && !isSelected) {
+                          return (
+                            <div
+                              className={`w-full px-2 cursor-text truncate ${isBold ? 'font-bold' : 'font-normal'}`}
+                              onClick={(e) => {
+                                if ((e.metaKey || e.ctrlKey) && onToggleCellSelection) {
+                                  onToggleCellSelection(cellId)
+                                } else {
+                                  onSelectCell(cellId)
+                                  setTimeout(() => document.getElementById(`cell-${cellId}`)?.focus(), 0)
+                                }
+                              }}
                             >
-                              {wb.text}
-                              {i < cell!.word_boxes!.length - 1 ? ' ' : ''}
-                            </span>
-                          ))}
-                        </div>
-                      ) : (cell?.text ?? '').includes('\n') ? (
-                          <textarea
-                            id={`cell-${cellId}`}
-                            value={cell?.text ?? ''}
-                            onChange={(e) => onCellTextChange(cellId, e.target.value)}
-                            onFocus={() => onSelectCell(cellId)}
-                            onClick={(e) => {
-                              if ((e.metaKey || e.ctrlKey) && onToggleCellSelection) {
-                                e.preventDefault()
-                                onToggleCellSelection(cellId)
-                              }
-                            }}
-                            onKeyDown={(e) => {
-                              if (e.key === 'Tab') {
-                                e.preventDefault()
-                                onNavigate(cellId, e.shiftKey ? 'left' : 'right')
-                              }
-                            }}
-                            rows={(cell?.text ?? '').split('\n').length}
-                            className={`w-full px-2 bg-transparent border-0 outline-none resize-none ${
-                              isBold ? 'font-bold' : 'font-normal'
-                            }`}
-                            style={{ color: cellColor || undefined }}
-                            spellCheck={false}
-                          />
-                        ) : (
+                              {cell!.word_boxes!.map((wb, i) => (
+                                <span
+                                  key={i}
+                                  style={
+                                    wb.color_name && wb.color_name !== 'black'
+                                      ? { color: wb.color }
+                                      : undefined
+                                  }
+                                >
+                                  {wb.text}
+                                  {i < cell!.word_boxes!.length - 1 ? ' ' : ''}
+                                </span>
+                              ))}
+                            </div>
+                          )
+                        }
+                        if (isMultiLine) {
+                          return (
+                            <textarea
+                              id={`cell-${cellId}`}
+                              value={cellText}
+                              onChange={(e) => onCellTextChange(cellId, e.target.value)}
+                              onFocus={() => onSelectCell(cellId)}
+                              onClick={(e) => {
+                                if ((e.metaKey || e.ctrlKey) && onToggleCellSelection) {
+                                  e.preventDefault()
+                                  onToggleCellSelection(cellId)
+                                }
+                              }}
+                              onKeyDown={(e) => {
+                                if (e.key === 'Tab') {
+                                  e.preventDefault()
+                                  onNavigate(cellId, e.shiftKey ? 'left' : 'right')
+                                }
+                              }}
+                              rows={cellText.split('\n').length}
+                              className={`w-full px-2 bg-transparent border-0 outline-none resize-none ${
+                                isBold ? 'font-bold' : 'font-normal'
+                              }`}
+                              style={{ color: cellColor || undefined }}
+                              spellCheck={false}
+                            />
+                          )
+                        }
+                        return (
                           <input
                             id={`cell-${cellId}`}
                             type="text"
-                            value={cell?.text ?? ''}
+                            value={cellText}
                             onChange={(e) => onCellTextChange(cellId, e.target.value)}
                             onFocus={() => onSelectCell(cellId)}
                             onClick={(e) => {
@@ -576,7 +585,7 @@ export function GridTable({
                             spellCheck={false}
                           />
                         )
-                      )}
+                      })()}
                     </div>
                   )
                 })