diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1954af5bc3e..463d9f67bb1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-05  Pedro Alves  <palves@redhat.com>
+
+	PR tui/15933
+	* tui/tui-regs.c (tui_show_registers): Show registers of the
+	selected frame, not the current frame.
+
 2013-09-05  Ricard Wanderlof  <ricardw@axis.com>
 
 	* MAINTAINERS (Write After Approval): Add myself to the list.
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index bb723402560..b043a29c24b 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -157,7 +157,7 @@ tui_show_registers (struct reggroup *group)
 
   if (target_has_registers && target_has_stack && target_has_memory)
     {
-      ret = tui_show_register_group (group, get_current_frame (),
+      ret = tui_show_register_group (group, get_selected_frame (NULL),
                                      group == display_info->current_group);
     }
   if (ret == TUI_FAILURE)