diff --git a/shrc b/shrc
index 00c019d..8db5124 100755
--- a/shrc
+++ b/shrc
@@ -1254,19 +1254,26 @@ __my_set_title(){
     case $TERM in
         (rxvt*|xterm*|aterm|screen*)
             test -t 1 &&
-            test -n "$DISPLAY" &&
             test -z "$EMACS" &&
             echo -n -e "\033]0;$1\007"
             ;;
     esac
 }
 
-if test -n "$TMUX"
-then
-    __terminal_title="\$(basename \${PWD})"
-else
-    __terminal_title"\${USER}@\${HOSTNAME}\:\${PWD}"
-fi
+case "$TERM" in
+    screen*)
+        if test -n "$SSH_CONNECTION"
+        then
+            __terminal_title="\${USER}@\${HOSTNAME}:\$(basename \${PWD})"
+        else
+            __terminal_title="\$(basename \${PWD})"
+        fi
+        ;;
+    *)
+        __terminal_title="\${USER}@\${HOSTNAME}:\${PWD}"
+        ;;
+esac
+
 if $inzsh
 then
     precmd(){