diff --git a/bin/.xsh b/bin/.xsh
index f3760a4d..5179ba56 100644
--- a/bin/.xsh
+++ b/bin/.xsh
@@ -205,17 +205,10 @@ if [[ $- =~ i ]]; then
 
   if [ $xiki_go_key ]; then
     if [ -n "$ZSH_VERSION" ]; then
-
-      if [[ -o extended_glob ]]; then
-        # Weird setting that messes up caret
-        bindkey -s $xiki_go_key '\C-axsh \\\^\n'
-      else
-        # Normal zsh
-        bindkey -s $xiki_go_key '\C-axsh \^\n'
-      fi
+      bindkey -s $xiki_go_key '\C-axsh +\n'
 
     else   # Assume bash or bash-compatible
-      bind \"$xiki_go_key'" "\C-axsh ^\n"'
+      bind \"$xiki_go_key'" "\C-axsh +\n"'
     fi
   fi
 
diff --git a/lib/xiki/core/view.rb b/lib/xiki/core/view.rb
index 1ec4f3a1..c9e59c62 100644
--- a/lib/xiki/core/view.rb
+++ b/lib/xiki/core/view.rb
@@ -2383,11 +2383,6 @@ def self.expose
       # Results in 5 columns
       individual_width = whole_width / 4
 
-      Ol Buffers.list_names(:user_only=>1)
-
-      # Set 1st view
-      Ol Buffers.list
-
       count = 0
 
       buffers = Buffers.list_names(:user_only=>1)
diff --git a/lib/xiki/core/xsh.rb b/lib/xiki/core/xsh.rb
index 2c1fe059..97e0dba7 100644
--- a/lib/xiki/core/xsh.rb
+++ b/lib/xiki/core/xsh.rb
@@ -69,13 +69,11 @@ def self.run options={}
         args = ""
 
       # xsh = > or > ^G...
-      elsif args == "^"
 
-        # -/, so recognize as ^G on blank line...
+      elsif args == "+"
 
         # Jump back to last place we were (or last place content+grab was run)
-        self.to_go_location
-        options[:do_nothing] = 1
+        return self.to_go_location
 
       # xsh - > or > ^T...
       elsif args == "-"
@@ -209,7 +207,7 @@ def self.run options={}
         args = View.dir
 
       # -foo/, so treat as xiki command...
-      elsif args.slice!(/^\^/)
+      elsif args.slice!(/^\+/)
 
         # grab+ on ^bookmark, so cd and exit...