diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index 137c3ef4a..86cf36104 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -60,12 +60,11 @@ const CodeEditor = createClass({
 
 	getInitialState : function() {
 		return {
-			docs          : {},
-			widgetUtils   : {},
-			widgets       : [],
-			focusedWidget : null,
-			hints         : [],
-			hintsField    : undefined,
+			docs        : {},
+			widgetUtils : {},
+			widgets     : [],
+			hints       : [],
+			hintsField  : undefined,
 		};
 	},
 
diff --git a/shared/naturalcrit/codeEditor/helpers/widget-elements/hints/hints.jsx b/shared/naturalcrit/codeEditor/helpers/widget-elements/hints/hints.jsx
index 6227b02b1..a20ab6bf4 100644
--- a/shared/naturalcrit/codeEditor/helpers/widget-elements/hints/hints.jsx
+++ b/shared/naturalcrit/codeEditor/helpers/widget-elements/hints/hints.jsx
@@ -87,8 +87,18 @@ const Hints = createClass({
 				let className = 'CodeMirror-hint';
 				if(activeHint === i) {
 					className += ' CodeMirror-hint-active';
+					return <li key={i}
+						className={className}
+						onMouseDown={(e)=>field.hintSelected(h, e)}
+						ref={this.activeHintRef}>
+						{h.hint}
+					</li>;
 				}
-				return <li key={i} className={className} onMouseDown={(e)=>field.hintSelected(h, e)}>{h.hint}</li>;
+				return <li key={i}
+					className={className}
+					onMouseDown={(e)=>field.hintSelected(h, e)}>
+					{h.hint}
+				</li>;
 			});
 
 		let style = {
@@ -103,7 +113,13 @@ const Hints = createClass({
 			};
 		}
 		return <React.Fragment>
-			<ul role={'listbox'} id={'hints'} aria-expanded={true} className={'CodeMirror-hints default'} style={style} onKeyDown={this.keyDown}>
+			<ul role={'listbox'}
+				id={'hints'}
+				aria-expanded={true}
+				className={'CodeMirror-hints default'}
+				style={style}
+				onKeyDown={this.keyDown}
+				ref={this.hintsRef}>
 				{hintElements}
 			</ul>
 		</React.Fragment>;