diff --git a/bashrc b/bashrc
index 1b84fbf1e43a5eef6d8ae906edc9552cbd5e2915..111873ee0f1e2a06cee503e46f863c5152c45d35 100644
--- a/bashrc
+++ b/bashrc
@@ -58,6 +58,11 @@ else
 fi
 unset color_prompt force_color_prompt
 
+# If this is a SCREEN session, modify the prompt
+if [ -n "$STY" ]; then
+    PS1_PRE="\[\033[33m\](${STY#[0-9]*\.}:${WINDOW})\[\033[0m\] $PS1_PRE"
+fi
+
 PS1_POST=' \$ '
 PS1="$PS1_PRE$PS1_POST"