diff --git a/wax-table-service/src/components/CreateTable.js b/wax-table-service/src/components/CreateTable.js
index 8af593bc37f662d8d938963ea4a066b97855722f..9a76200fba8091b35bba727e4e2d7d83fdc3784e 100644
--- a/wax-table-service/src/components/CreateTable.js
+++ b/wax-table-service/src/components/CreateTable.js
@@ -65,8 +65,10 @@ const CreateTable = ({ item }) => {
           active={isOpen}
           disabled={isDisabled}
           iconName={icon}
-          onMouseDown={() => {
+          onMouseDown={e => {
+            e.preventDefault();
             setIsOpen(!isOpen);
+            activeView.focus();
           }}
           title={
             !isEmpty(i18n) && i18n.exists(`Wax.Tables.${title}`)