diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 56d4070e..54ef51c8 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -96,9 +96,9 @@ md.block.ruler.at('paragraph', function (state, startLine/*, endLine*/) {
   token.map = [ startLine, state.line ]
 
   if (state.parentType === 'list') {
-    let match = content.match(/\[( |x)\] ?(.+)/i)
+    let match = content.match(/^\[( |x)\] ?(.+)/i)
     if (match) {
-      content = `<label class='taskListItem' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${match[2]}</label>`
+      content = `<label class='taskListItem' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
     }
   }
 
diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl
index 613d5072..5a5bafce 100644
--- a/browser/main/Detail/TagSelect.styl
+++ b/browser/main/Detail/TagSelect.styl
@@ -26,7 +26,7 @@
   margin 0
   padding 0
   border-style solid
-  border-color $ui-borderColor
+  border-color $ui-button--focus-borderColor
   border-width 0 0 0 3px
   line-height 18px
   background-color transparent
diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl
index d7166f9e..2a8d1fde 100644
--- a/browser/main/NoteList/NoteList.styl
+++ b/browser/main/NoteList/NoteList.styl
@@ -83,7 +83,7 @@
   border-radius 3px
   vertical-align middle
   border-style solid
-  border-color $ui-borderColor
+  border-color $ui-button--focus-borderColor
   border-width 0 0 0 3px
   background-color $ui-backgroundColor