diff --git a/src/ChangeLog b/src/ChangeLog
index 4cf3a6a48..bc95d3f4c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-08  Pavel Tsekov  <ptsekov@gmx.net>
+
+	* subshell.c (resize_subshell): Do not try to resize the subshell tty
+	if the subshell is not running.
+
 2006-04-13  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* cons.handler.c (handle_console_linux): Remove redundant close() calls
diff --git a/src/subshell.c b/src/subshell.c
index 780a96916..07f983231 100644
--- a/src/subshell.c
+++ b/src/subshell.c
@@ -660,6 +660,9 @@ static int resize_tty (int fd)
 /* Resize subshell_pty */
 void resize_subshell (void)
 {
+    if (use_subshell == 0)
+	return;
+
     resize_tty (subshell_pty);
 }