diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ea5dd32e28f..dc184c59ea6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-16  Ruslan Kabatsayev  <b7.10110111@gmail.com>
+
+	* tui/tui.c (tui_commands): Add "nexti" and "stepi" to the Single-Key
+	mode command list.
+
 2017-08-15  Stafford Horne  <shorne@gmail.com>
 
 	* MAINTAINERS (Write After Approval): Add Stafford Horne.
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 4b406985ab4..8e3e5ce0b0c 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-16  Ruslan Kabatsayev  <b7.10110111@gmail.com>
+
+	* gdb.texinfo (TUI Single Key Mode): Document the new shortcuts in
+	Single-Key mode.
+
 2017-08-12  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	PR gdb/21925
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 75281835061..0d39a55656e 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -25415,6 +25415,10 @@ finish
 @item n
 next
 
+@kindex o @r{(SingleKey TUI key)}
+@item o
+nexti.  The shortcut letter @samp{o} stands for ``step Over''.
+
 @kindex q @r{(SingleKey TUI key)}
 @item q
 exit the SingleKey mode.
@@ -25427,6 +25431,10 @@ run
 @item s
 step
 
+@kindex i @r{(SingleKey TUI key)}
+@item i
+stepi.  The shortcut letter @samp{i} stands for ``step Into''.
+
 @kindex u @r{(SingleKey TUI key)}
 @item u
 up
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index c918f3e2364..b77a885adb9 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -75,8 +75,10 @@ static const struct tui_char_command tui_commands[] = {
   { 'd', "down" },
   { 'f', "finish" },
   { 'n', "next" },
+  { 'o', "nexti" },
   { 'r', "run" },
   { 's', "step" },
+  { 'i', "stepi" },
   { 'u', "up" },
   { 'v', "info locals" },
   { 'w', "where" },