diff --git a/bashrc b/bashrc
index 67ab072..905952f 100755
--- a/bashrc
+++ b/bashrc
@@ -53,6 +53,7 @@ export VISUAL="$EDITOR"
 export GIT_PAGER="$PAGER"
 export GIT_EDITOR="$EDITOR"
 echo "$TERM" | grep '^screen' >/dev/null 2>&1 || export TERM_ORIG=$TERM
+test "$TERM" = screen && test "$TERM_ORIG" = xterm-256color && TERM=screen-256color
 
 test -z "$TMP" && export TMP=/tmp/${USER}-tmp
 mkdir -p "$TMP"
diff --git a/tmux.conf b/tmux.conf
index d8ca385..2e862a0 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -7,7 +7,7 @@ bind-key C command-prompt "new-window '%%'"
 #setw -g mode-keys vi
 
 set -g default-command /bin/bash
-set -g default-terminal screen-256color
+#set -g default-terminal screen-256color
 #set -g default-terminal screen-16color
 
 #set -g status-left ""