diff --git a/src/Common/TableEntity.tsx b/src/Common/TableEntity.tsx
index 33f764b42..79f509df4 100644
--- a/src/Common/TableEntity.tsx
+++ b/src/Common/TableEntity.tsx
@@ -137,12 +137,13 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
         />
         {!isEntityValueDisable && (
           <TooltipHost content="Edit property" id="editTooltip">
-            <div tabIndex={0}>
+            <div>
               <Image
                 {...imageProps}
                 src={EditIcon}
                 alt="editEntity"
                 onClick={onEditEntity}
+                tabIndex={0}
                 onKeyPress={handleKeyPress}
               />
             </div>