diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fa532dc8b0..b7c9f245617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 1. [16919](https://github.com/influxdata/influxdb/pull/16919): Sort dashboards on homepage alphabetically
 1. [16934](https://github.com/influxdata/influxdb/pull/16934): Tokens page now sorts by status
 1. [16931](https://github.com/influxdata/influxdb/pull/16931): Set the defualt value of tags in a Check
+1. [16935](https://github.com/influxdata/influxdb/pull/16935): Fix sort by variable type
 
 ## v2.0.0-beta.4 [2020-02-14]
 
diff --git a/ui/src/variables/components/VariableList.tsx b/ui/src/variables/components/VariableList.tsx
index 16ea19e8739..2f39ea434af 100644
--- a/ui/src/variables/components/VariableList.tsx
+++ b/ui/src/variables/components/VariableList.tsx
@@ -14,7 +14,7 @@ import {Sort} from '@influxdata/clockface'
 // Selectors
 import {getSortedResources} from 'src/shared/utils/sort'
 
-type SortKey = keyof Variable
+type SortKey = keyof Variable | 'arguments.type'
 
 interface Props {
   variables: Variable[]
@@ -77,7 +77,7 @@ export default class VariableList extends PureComponent<Props, State> {
   }
 
   private get headerKeys(): SortKey[] {
-    return ['name', 'arguments']
+    return ['name', 'arguments.type']
   }
 
   private get rows(): JSX.Element[] {