diff --git a/src/components/inputs/AutocompleteInput.jsx b/src/components/inputs/AutocompleteInput.jsx
index 8c9e13ba..7546873b 100644
--- a/src/components/inputs/AutocompleteInput.jsx
+++ b/src/components/inputs/AutocompleteInput.jsx
@@ -41,6 +41,7 @@ class AutocompleteInput extends React.Component {
           style={{
             userSelect: 'none',
             color: colors.lowgray,
+            cursor: 'default',
             background: isHighlighted ? colors.midgray : colors.gray,
             padding: margins[0],
             fontSize: fontSizes[5],
diff --git a/src/components/inputs/FontInput.jsx b/src/components/inputs/FontInput.jsx
index b04d8218..dc29e3f1 100644
--- a/src/components/inputs/FontInput.jsx
+++ b/src/components/inputs/FontInput.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import SelectInput from './SelectInput'
+import AutocompleteInput from './AutocompleteInput'
 import input from '../../config/input.js'
 
 //TODO: Query available font stack dynamically
@@ -24,12 +24,8 @@ class FontInput extends React.Component {
 
   render() {
     const inputs = this.values.map((value, i) => {
-      return <SelectInput
+      return <AutocompleteInput
         key={i}
-        style={{
-          width: '100%',
-          ...this.props.style,
-        }}
         value={value}
         options={fontStacks.map(f => [f, f])}
         onChange={this.changeFont.bind(this, i)}