diff --git a/after/ftplugin/netrw.vim b/after/ftplugin/netrw.vim
index 2be4e8e..f8d0c79 100644
--- a/after/ftplugin/netrw.vim
+++ b/after/ftplugin/netrw.vim
@@ -1,4 +1,4 @@
-nmap <buffer><silent> o <CR>:call CloseNetrw(1)<CR>
-nmap <buffer><silent> q :call CloseNetrw(0)<CR>
+nmap <buffer> o <CR>
+nmap <buffer><silent> q <CR>:call CloseNetrw(1)<CR>
+nmap <buffer><silent> Q :call CloseNetrw(0)<CR>
 setl bufhidden=wipe
-setl rnu nu
diff --git a/vimrc b/vimrc
index add1d3f..0ff6e0f 100644
--- a/vimrc
+++ b/vimrc
@@ -466,6 +466,7 @@ command! -nargs=1 -complete=command Redir silent call Redir(<q-args>)
 "}}}
 function! OpenNetrw() abort "{{{
     Texplore
+    setl rnu nu
 endfunction
 "}}}
 
@@ -474,7 +475,9 @@ function! CloseNetrw(keep_buffer) abort "{{{
     let l:current_buffer = bufnr("%")
     tabclose
     tabprevious
-    execute "buffer" l:current_buffer
+    if bufexists(l:current_buffer) > 0
+      execute "buffer" l:current_buffer
+    endif
   else
     tabclose
     tabprevious