diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx
index 4d5ab20b..de8b00b9 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx
@@ -29,7 +29,7 @@ export const TableViewRow = ({ index, record }: TableViewRowProps) => {
           {index + 1}
         </span>
         <div
-          className="h-8 border-r"
+          className="h-8 border-r overflow-hidden"
           style={{ width: `${view.nameWidth}px`, minWidth: '300px' }}
         >
           <TableViewNameCell record={record} />
@@ -38,7 +38,7 @@ export const TableViewRow = ({ index, record }: TableViewRowProps) => {
           return (
             <div
               key={`row-${record.id}-${field.field.id}`}
-              className="h-8 border-r p-1"
+              className="h-8 border-r p-1 overflow-hidden"
               style={{ width: `${field.width}px` }}
             >
               <RecordFieldValue field={field.field} />
diff --git a/apps/desktop/src/renderer/components/emojis/emoji-browser.tsx b/apps/desktop/src/renderer/components/emojis/emoji-browser.tsx
index 3ca28795..c14e34ba 100644
--- a/apps/desktop/src/renderer/components/emojis/emoji-browser.tsx
+++ b/apps/desktop/src/renderer/components/emojis/emoji-browser.tsx
@@ -74,10 +74,18 @@ export const EmojiBrowser = () => {
           };
 
           if (row.type === 'category') {
-            return <EmojiBrowserCategory row={row} style={style} />;
+            return (
+              <EmojiBrowserCategory
+                row={row}
+                style={style}
+                key={row.category}
+              />
+            );
           }
 
-          return <EmojiBrowserItems row={row} style={style} />;
+          return (
+            <EmojiBrowserItems row={row} style={style} key={row.category} />
+          );
         })}
       </div>
     </div>