diff --git a/less/TableStyles/queryBuilder.less b/less/TableStyles/queryBuilder.less
index d978dd705..7a31ab71e 100644
--- a/less/TableStyles/queryBuilder.less
+++ b/less/TableStyles/queryBuilder.less
@@ -230,7 +230,7 @@ input::-webkit-inner-spin-button {
 .advanced-options-panel .advanced-options .select .select-options-link {
   margin-left: 4px;
   cursor: pointer;
-  outline: none;
+  padding: 2px;
 }
 
 .query-panel .row .column-headers .Field {
diff --git a/src/Common/TableEntity.tsx b/src/Common/TableEntity.tsx
index e4072f190..33f764b42 100644
--- a/src/Common/TableEntity.tsx
+++ b/src/Common/TableEntity.tsx
@@ -143,7 +143,6 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
                 src={EditIcon}
                 alt="editEntity"
                 onClick={onEditEntity}
-                tabIndex={0}
                 onKeyPress={handleKeyPress}
               />
             </div>