diff --git a/changelog b/changelog
index b5c880d..b5012d5 100644
--- a/changelog
+++ b/changelog
@@ -37,6 +37,7 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 [Apr 11 2009] - Jamdog
   Bug-Fix: NPC check added to do_gen_ps function (thanks drefs)
   Bug-Fix: Fixed crash bug in remove_player where index entry is removed too early (thanks drefs)
+  Bug-Fix: Commands and Socials list correctly when switched into a mob (thanks Rumble)
 [Apr 06 2009] - Jamdog
   Bug-Fix: Changing a player name no longer allows two words (thanks Slicer)
 [Apr 05 2009] - Jamdog
diff --git a/src/utils.c b/src/utils.c
index e7305c5..0ab4398 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -965,7 +965,9 @@ void column_list(struct char_data *ch, int num_cols, const char **list, int list
        max_len = strlen(list[i]);
 
    /* Calculate the width of each column */
-   col_width = (GET_SCREEN_WIDTH(ch)) / num_cols;
+   if (IS_NPC(ch))   col_width = 80 / num_cols;
+   else              col_width = (GET_SCREEN_WIDTH(ch)) / num_cols;
+
    if (show_nums) col_width-=4;
 
    if (col_width < max_len)