diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index d3983889f7..a386f5c6c3 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -421,6 +421,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
     backslashStringEscapes: false,
+    identifierQuote: "\"", // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+    hooks: {
+      "\"":   hookIdentifierDoublequote
+    },
     dateSQL: set("date time timestamp"),
     support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
   });