diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 41848807..ced9a261 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -915,6 +915,7 @@ class Controller(object):
    self.view.change_buffer(buff-1)
   while self.get_current_buffer().invisible == False: self.skip_buffer(False)
   buffer = self.get_current_buffer()
+  if self.showing == True: buffer.buffer.set_focus_in_list()
   try:
    msg = _(u"%s, %s of %s") % (self.view.get_buffer_text(), buffer.buffer.list.get_selected()+1, buffer.buffer.list.get_count())
   except:
@@ -933,6 +934,7 @@ class Controller(object):
    self.view.change_buffer(buff+1)
   while self.get_current_buffer().invisible == False: self.skip_buffer(True)
   buffer = self.get_current_buffer()
+  if self.showing == True: buffer.buffer.set_focus_in_list()
   try:
    msg = _(u"%s, %s of %s") % (self.view.get_buffer_text(), buffer.buffer.list.get_selected()+1, buffer.buffer.list.get_count())
   except:
@@ -953,6 +955,7 @@ class Controller(object):
    return
   self.view.change_buffer(buff)
   buffer = self.get_current_buffer()
+  if self.showing == True: buffer.buffer.set_focus_in_list()
   try:
    msg = _(u"%s. %s, %s of %s") % (buffer.account, self.view.get_buffer_text(), buffer.buffer.list.get_selected()+1, buffer.buffer.list.get_count())
   except:
@@ -973,6 +976,7 @@ class Controller(object):
    return
   self.view.change_buffer(buff)
   buffer = self.get_current_buffer()
+  if self.showing == True: buffer.buffer.set_focus_in_list()
   try:
    msg = _(u"%s. %s, %s of %s") % (buffer.account, self.view.get_buffer_text(), buffer.buffer.list.get_selected()+1, buffer.buffer.list.get_count())
   except:
diff --git a/src/wxUI/buffers/base.py b/src/wxUI/buffers/base.py
index 7c32aa0e..03c74e85 100644
--- a/src/wxUI/buffers/base.py
+++ b/src/wxUI/buffers/base.py
@@ -39,4 +39,7 @@ class basePanel(wx.Panel):
   if reversed == False:
    self.list.select_item(self.list.get_count()-1)
   else:
-   self.list.select_item(0)
\ No newline at end of file
+   self.list.select_item(0)
+
+ def set_focus_in_list(self):
+  self.list.list.SetFocus()
\ No newline at end of file
diff --git a/src/wxUI/buffers/events.py b/src/wxUI/buffers/events.py
index cb1e5849..929d5c91 100644
--- a/src/wxUI/buffers/events.py
+++ b/src/wxUI/buffers/events.py
@@ -18,4 +18,7 @@ class eventsPanel(wx.Panel):
   if reversed == False:
    self.list.select_item(self.list.get_count()-1)
   else:
-   self.list.select_item(0)
\ No newline at end of file
+   self.list.select_item(0)
+
+ def set_focus_in_list(self):
+  self.list.list.SetFocus()
\ No newline at end of file