diff --git a/README.md b/README.md
index cfe2779..6737c5d 100644
--- a/README.md
+++ b/README.md
@@ -158,8 +158,7 @@ The format of the date string is also configurable using the
 `g:SimplenoteStrftime` option. The default strftime is
 `"%a, %d %b %Y %H:%M:%S"`.
 
-## Colors
-
+### Colors
 If the `+conceal` feature is enabled in vim then syntax highlighting is
 supported for the Simplenote note list. The highlight groups supported are:
 
@@ -172,6 +171,16 @@ supported for the Simplenote note list. The highlight groups supported are:
     SN_NoteAgeYear     note title - less than a year old ('%N' format)
     SN_NoteAgeAncient  note title - ancient ('%N' format)
 
+## Single Window Mode
+By default simplenote.vim will open notes in new windows. If you would prefer
+simplenote.vim to emulate the behaviour of the Simplenote website and native
+applications then set `g:SimplenoteSingleWindow` (to anything) in your `.vimrc`
+and simplenote.vim will try as much as possible to re-use one window for
+opening all notes. Note: due to the way Vim handles and numbers windows, this
+behaviour can't be perfect and if you manually open a window between the note
+index and the first note opened then this new window will be targetted for
+notes.
+
 ## Dependencies
 Version 2 of the SimpleNote API relies heavily on JSON. As JSON and VimL don't
 really play nice together, basic parts of this plugin are implemented in python.
diff --git a/autoload/simplenote.vim b/autoload/simplenote.vim
index dd21f2e..bd04f20 100644
--- a/autoload/simplenote.vim
+++ b/autoload/simplenote.vim
@@ -76,7 +76,7 @@ let g:simplenote_scratch_buffer = 'Simplenote'
 let g:simplenote_note_winnr = 0
 
 " Function that opens or navigates to the scratch buffer.
-" TODO: This is a complicated mess and could be improved
+" TODO: This is a complicated mess and it would be nice to improve it, but I'm really not sure how.
 function! s:ScratchBufferOpen(name)
     let exe_new = "new "
     let exe_split = "split "