diff --git a/ui/src/ifql/components/TimeMachineEditor.tsx b/ui/src/ifql/components/TimeMachineEditor.tsx
index f5caa40a2..43a2c7930 100644
--- a/ui/src/ifql/components/TimeMachineEditor.tsx
+++ b/ui/src/ifql/components/TimeMachineEditor.tsx
@@ -39,12 +39,13 @@ class TimeMachineEditor extends PureComponent<Props> {
 
     const options = {
       lineNumbers: true,
-      theme: 'material',
+      theme: 'time-machine',
       tabIndex: 1,
       readonly: false,
       extraKeys: {'Ctrl-Space': 'autocomplete'},
       completeSingle: false,
       autoRefresh: true,
+      mode: 'ifql',
     }
 
     return (
diff --git a/ui/src/kapacitor/components/TickscriptEditor.js b/ui/src/kapacitor/components/TickscriptEditor.js
index 686a9de20..77bb2ce54 100644
--- a/ui/src/kapacitor/components/TickscriptEditor.js
+++ b/ui/src/kapacitor/components/TickscriptEditor.js
@@ -19,9 +19,10 @@ class TickscriptEditor extends Component {
 
     const options = {
       lineNumbers: true,
-      theme: 'material',
+      theme: 'tickscript',
       tabIndex: 1,
       readonly: false,
+      mode: 'tickscript',
     }
 
     return (