diff --git a/src/components/CommandPalette.jsx b/src/components/CommandPalette.jsx
index f48a9fb..63b6ac7 100644
--- a/src/components/CommandPalette.jsx
+++ b/src/components/CommandPalette.jsx
@@ -7,6 +7,7 @@ import {
 	SWITCH_FILE_EVENT
 } from '../commandPaletteService';
 import { FileIcon } from './FileIcon';
+import { UP_KEY, DOWN_KEY, ENTER_KEY } from '../keyboardKeys';
 
 function getFolder(filePath) {
 	const split = filePath.split('/');
@@ -16,14 +17,19 @@ function getFolder(filePath) {
 	}
 	return '';
 }
-function Row({ item, onClick }) {
+function Row({ item, onClick, isSelected }) {
 	return (
 		<li>
-			<button style="background:0;border:0;" onClick={onClick}>
+			<button
+				class={`command-palette__option-row ${
+					isSelected ? 'command-palette__option-row--selected' : ''
+				}`}
+				onClick={onClick}
+			>
 				{item.path ? <FileIcon file={item} /> : null}
 				{item.name}
 				{item.path ? (
-					<span style="color:#ccc;margin-left:10px;font-size:0.8em;">
+					<span class="command-palette__option-subtitle">
 						{getFolder(item.path)}
 					</span>
 				) : null}
@@ -32,7 +38,7 @@ function Row({ item, onClick }) {
 	);
 }
 export class CommandPalette extends Component {
-	state = { list: [], search: '' };
+	state = { list: [], search: '', selectedIndex: 0 };
 	componentDidUpdate(previousProps) {
 		if (this.props.show && !previousProps.show) {
 			this.state.search = '';
@@ -58,17 +64,32 @@ export class CommandPalette extends Component {
 		);
 	}
 
+	keyDownHandler(e) {
+		const diff = { [UP_KEY]: -1, [DOWN_KEY]: 1 }[e.which];
+		if (diff) {
+			this.setState({
+				selectedIndex:
+					(this.state.selectedIndex + diff) % this.state.list.length
+			});
+			return;
+		}
+		if (e.which === ENTER_KEY) {
+			this.selectOption(this.state.list[this.state.selectedIndex]);
+		}
+	}
 	inputHandler(e) {
 		const search = e.target.value;
 		this.setState({ search });
-		if (search.indexOf('>') === 0) {
-			this.isCommandMode = true;
-		}
+		this.isCommandMode = search.indexOf('>') === 0;
 		this.setState({
-			list: this.getFilteredList(search)
+			list: this.getFilteredList(search),
+			selectedIndex: 0
 		});
 	}
 	optionClickHandler(option) {
+		this.selectOption(option);
+	}
+	selectOption(option) {
 		commandPaletteService.publish(
 			option.path ? SWITCH_FILE_EVENT : option.event,
 			option
@@ -77,14 +98,21 @@ export class CommandPalette extends Component {
 	}
 	render() {
 		return (
-			<Modal show={this.props.show} closeHandler={this.props.closeHandler}>
+			<Modal
+				show={this.props.show}
+				closeHandler={this.props.closeHandler}
+				noOverlay
+				hideCloseButton
+			>
 				<AutoFocusInput
 					value={this.state.search}
 					onInput={this.inputHandler.bind(this)}
+					onKeyUp={this.keyDownHandler.bind(this)}
 				/>
 				<ul style="padding:0;list-style:none;">
-					{this.state.list.map(item => (
+					{this.state.list.map((item, index) => (
 						<Row
+							isSelected={this.state.selectedIndex === index}
 							item={item}
 							onClick={this.optionClickHandler.bind(this, item)}
 						/>
diff --git a/src/components/Modal.jsx b/src/components/Modal.jsx
index 6b5f4ba..5f3c4b9 100644
--- a/src/components/Modal.jsx
+++ b/src/components/Modal.jsx
@@ -24,9 +24,11 @@ export default class Modal extends Component {
 	}
 	componentDidUpdate(prevProps) {
 		if (this.props.show !== prevProps.show) {
-			document.body.classList[this.props.show ? 'add' : 'remove'](
-				'overlay-visible'
-			);
+			if (!this.props.noOverlay) {
+				document.body.classList[this.props.show ? 'add' : 'remove'](
+					'overlay-visible'
+				);
+			}
 			if (this.props.show) {
 				// HACK: refs will evaluate on next tick due to portals
 				setTimeout(() => {
@@ -63,15 +65,17 @@ export default class Modal extends Component {
 					onClick={this.onOverlayClick.bind(this)}
 				>
 					<div class="modal__content">
-						<button
-							type="button"
-							onClick={this.props.closeHandler}
-							aria-label="Close modal"
-							title="Close"
-							class="js-modal__close-btn modal__close-btn"
-						>
-							Close
-						</button>
+						{this.props.hideCloseButton ? null : (
+							<button
+								type="button"
+								onClick={this.props.closeHandler}
+								aria-label="Close modal"
+								title="Close"
+								class="js-modal__close-btn modal__close-btn"
+							>
+								Close
+							</button>
+						)}
 						{this.props.children}
 					</div>
 				</div>
diff --git a/src/style.css b/src/style.css
index 885dc92..a2c99de 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1,5 +1,6 @@
 :root {
-	--color-text: #d4cde9;
+	--color-text: #e2daf9;
+	--color-text-dark-1: #b3aec4;
 	--color-bg: #252637;
 	--color-popup: #3a2b63;
 	--code-font-size: 16px;
@@ -74,6 +75,10 @@ button {
 .d-i {
 	display: inline;
 }
+
+.d-b {
+	display: block;
+}
 .flex {
 	display: flex;
 }
@@ -1688,28 +1693,6 @@ body:not(.is-app) .show-when-app {
 .is-file-mode .hide-in-file-mode {
 	display: none !important;
 }
-@media screen and (max-width: 600px) {
-	body {
-		font-size: 70%;
-	}
-
-	.main-header {
-		overflow-x: auto;
-	}
-
-	.main-header__btn-wrap {
-		flex-shrink: 0;
-	}
-
-	.modal__content {
-		padding: 1em;
-	}
-
-	.saved-items-pane {
-		width: 77vw;
-		padding: 10px 20px;
-	}
-}
 
 /* Codemirror themes basic bg styles. This is here so that there is no big FOUC
 while the theme CSS file is loading */
@@ -1807,3 +1790,41 @@ while the theme CSS file is loading */
 .cm-s-midnight .CodeMirror-activeline-background {
 	background: #253540;
 }
+.command-palette__option-row {
+	padding: 4px 5px;
+	width: 100%;
+	text-align: left;
+	border: 0;
+	background: transparent;
+	color: var(--color-text);
+}
+.command-palette__option-row--selected {
+	background: rgba(0, 0, 0, 0.2);
+}
+.command-palette__option-subtitle {
+	color: var(--color-text-dark-1);
+	margin-left: 10px;
+	font-size: 0.8em;
+}
+@media screen and (max-width: 600px) {
+	body {
+		font-size: 70%;
+	}
+
+	.main-header {
+		overflow-x: auto;
+	}
+
+	.main-header__btn-wrap {
+		flex-shrink: 0;
+	}
+
+	.modal__content {
+		padding: 1em;
+	}
+
+	.saved-items-pane {
+		width: 77vw;
+		padding: 10px 20px;
+	}
+}