diff --git a/extra/jheidi/createTableEvents.ajl b/extra/jheidi/createTableEvents.ajl
index 5d1925e0..c829c49f 100644
--- a/extra/jheidi/createTableEvents.ajl
+++ b/extra/jheidi/createTableEvents.ajl
@@ -37,7 +37,7 @@
      args().put("fieldKey", l.getSelectedValue());
      script("createTableState", args());
      
-     buffer.append("create table ").append(dbName).append(".").append(tableName).append(" (");
+     buffer.append("create table `").append(dbName).append("`.`").append(tableName).append("` (");
 
      List<String> priKeys = new ArrayList<String>();
      List<String> uniques = new ArrayList<String>();