diff --git a/src/display/window_peer_list.cc b/src/display/window_peer_list.cc
index a7ed015c..9d318873 100644
--- a/src/display/window_peer_list.cc
+++ b/src/display/window_peer_list.cc
@@ -108,9 +108,19 @@ WindowPeerList::redraw() {
     m_canvas->print(x, y, "%.1f", (double)p.down_rate()->rate() / 1024); x += 7;
     m_canvas->print(x, y, "%.1f", (double)p.peer_rate()->rate() / 1024); x += 7;
 
+    char remoteChoked;
+
+    if (!p.is_remote_choked_limited())
+      remoteChoked = 'U';
+    else if (p.is_remote_queued())
+      remoteChoked = 'Q';
+    else
+      remoteChoked = 'C';
+
     m_canvas->print(x, y, "%c/%c%c/%c%c",
                     p.is_encrypted() ? (p.is_incoming() ? 'R' : 'L') : (p.is_incoming() ? 'r' : 'l'),
-                    p.is_remote_queued() ? (p.is_remote_choked() ? 'C' : 'u') : (p.is_remote_choked() ? 'c' : 'U'),
+                    p.is_remote_choked() ? std::tolower(remoteChoked) : remoteChoked,
+
                     p.is_remote_interested() ? 'i' : 'n',
                     p.is_local_choked() ? 'c' : 'u',
                     p.is_local_interested() ? 'i' : 'n');