diff --git a/electron_src/popup/index.html b/electron_src/popup/index.html
index 2a9c9676..94fdba98 100644
--- a/electron_src/popup/index.html
+++ b/electron_src/popup/index.html
@@ -20,7 +20,7 @@
     </div>
 
     <div class="result-block row-fluid">
-      <ul class="result-list left-pane" ng-class="{focused:isFocusing == 2}">
+      <ul id="result-list" class="result-list left-pane" ng-class="{focused:isFocusing == 2}">
         <li ng-click="selectSnippet($index)" ng-repeat="snippet in filteredSnippets" ng-class="{active:$index == selectIndex}"><a href="#">{{snippet.description}}</a></li>
       </ul>
 
diff --git a/electron_src/popup/popup.js b/electron_src/popup/popup.js
index cb1ee946..264c6708 100644
--- a/electron_src/popup/popup.js
+++ b/electron_src/popup/popup.js
@@ -3,6 +3,8 @@
 var remote = require('remote')
 var ipc = require('ipc')
 
+var resultList = document.getElementById('result-list')
+
 angular.module('codexen.popup', [
   'ui.ace',
   'satellizer',
@@ -31,8 +33,10 @@ angular.module('codexen.popup', [
       e.preventDefault()
     })
     .add('right', function (e) {
+      e.preventDefault()
     })
     .add('left', function (e) {
+      e.preventDefault()
     })
     .add('esc', function (e) {
       hidePopUp()
@@ -41,6 +45,7 @@ angular.module('codexen.popup', [
       e.preventDefault()
     })
     .add('tab', function (e) {
+      e.preventDefault()
     })
     .add('enter', function (e) {
       console.log($scope.selectedItem.content)
@@ -118,6 +123,11 @@ angular.module('codexen.popup', [
 
   function priorSnippet () {
     if ($scope.selectIndex > 0) $scope.selectIndex -= 1
+
+    if (resultList.children[$scope.selectIndex].offsetTop < resultList.scrollTop) {
+      resultList.scrollTop -= 33
+    }
+
     selectSnippet()
   }
 
@@ -125,6 +135,11 @@ angular.module('codexen.popup', [
     if ($scope.selectIndex < $scope.filteredSnippets.length - 1) {
       $scope.selectIndex += 1
     }
+
+    if (resultList.clientHeight - 33 < resultList.children[$scope.selectIndex].offsetTop - resultList.scrollTop) {
+      resultList.scrollTop += 33
+    }
+
     selectSnippet()
   }
 
diff --git a/main.js b/main.js
index 3c658af0..62aa2da4 100644
--- a/main.js
+++ b/main.js
@@ -53,6 +53,7 @@ app.on('ready', function () {
   popUpWindow.on('blur', function () {
     popUpWindow.hide()
   })
+  popUpWindow.setVisibleOnAllWorkspaces(true)
 
   var hidePopUp = function () {
     if (fromMain) {