diff --git a/lib/xiki/core/console.rb b/lib/xiki/core/console.rb
index f006985d..6511fd6f 100644
--- a/lib/xiki/core/console.rb
+++ b/lib/xiki/core/console.rb
@@ -77,7 +77,7 @@ def self.run command, options={}
 
       dir = options[:dir]
       sync = options[:sync]
-      buffer = options[:buffer]
+      buffer = options[:buffer] || command.split(' ')[0]
       reuse_buffer = options[:reuse_buffer]
 
       orig = Location.new if options[:dont_move]