diff --git a/src/ChangeLog b/src/ChangeLog
index 64dee06f5..e07ab1a1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-07  Pavel Roskin  <proski@gnu.org>
+
+	* main.c (do_execute): Don't show prompt if the command is empty
+	and the subshell is not running.
+	* view.c (view_handle_key): Add support for Ctrl-O in the viewer.
+	Suggested by Walery Studennikov <despair@sama.ru>
+
 2001-08-06  Pavel Roskin  <proski@gnu.org>
 
 	* boxes.c (display_init): Associate correct help topic.
diff --git a/src/main.c b/src/main.c
index da606fea2..85097434d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -767,7 +767,7 @@ do_execute (const char *shell, const char *command, int flags)
 #ifndef __os2__
     unlink (control_file);
 #endif
-    if (!use_subshell && !(flags & EXECUTE_INTERNAL)){
+    if (!use_subshell && !(flags & EXECUTE_INTERNAL && command)) {
 	printf ("%s%s%s\n", last_paused ? "\r\n":"", prompt, command);
 	last_paused = 0;
     }
diff --git a/src/view.c b/src/view.c
index 2607a58f0..1a807c0ee 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2282,6 +2282,11 @@ view_handle_key (WView *view, int c)
         view_move_forward (view, vheight - 1);
         return 1;
 
+    case XCTRL('o'):
+	view_other_cmd ();
+	return 1;
+
+    /* Unlike Ctrl-O, run a new shell if the subshell is not running.  */
     case '!':
 	exec_shell ();
 	return 1;