diff --git a/src/wxUI/dialogs/configuration.py b/src/wxUI/dialogs/configuration.py
index 228098f2..25572f25 100644
--- a/src/wxUI/dialogs/configuration.py
+++ b/src/wxUI/dialogs/configuration.py
@@ -123,10 +123,13 @@ class other_buffers(wx.Panel):
 
  def move_up(self, *args, **kwargs):
   current = self.buffers.get_selected()
-  if self.buffers.get_text_column(current, 1) == 'hide':
+  if current == -1:
+   output.speak("Select a buffer first.",True)
+   return False
+  if self.buffers.get_text_column(current, 1) == 'Hide':
    output.speak("The buffer is hidden, show it first.",True)
    return False
-  if current == 0:
+  if current <= 0:
    output.speak("The buffer is already at the top of the list.",True)
    return false
   current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0)
@@ -140,10 +143,13 @@ class other_buffers(wx.Panel):
 
  def move_down(self, *args, **kwargs):
   current = self.buffers.get_selected()
-  if self.buffers.get_text_column(current, 1) == 'hide':
+  if current == -1:
+   output.speak("Select a buffer first.",True)
+   return False
+  if self.buffers.get_text_column(current, 1) == 'Hide':
    output.speak("The buffer is hidden, show it first.",True)
    return False
-  if current == self.buffers.get_count():
+  if current >= self.buffers.get_count():
    output.speak("The buffer is already at the bottom of the list.",True)
    return false
   current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0)