diff --git a/src/plugins/relay/relay-buffer.c b/src/plugins/relay/relay-buffer.c
index 18971779a..e209f813c 100644
--- a/src/plugins/relay/relay-buffer.c
+++ b/src/plugins/relay/relay-buffer.c
@@ -57,24 +57,23 @@ relay_buffer_refresh (const char *hotlist)
         weechat_buffer_clear (relay_buffer);
         line = 0;
         client_selected = relay_client_search_by_number (relay_buffer_selected_line);
-        if (client_selected)
-        {
-            weechat_printf_y (relay_buffer, 0,
-                              "%s%s%s%s%s%s%s",
-                              weechat_color("green"),
-                              _("Actions (letter+enter):"),
-                              weechat_color("lightgreen"),
-                              /* disconnect */
-                              (RELAY_CLIENT_HAS_ENDED(client_selected->status)) ?
-                              "" : _("  [D] Disconnect"),
-                              /* remove */
-                              (RELAY_CLIENT_HAS_ENDED(client_selected->status)) ?
-                              _("  [R] Remove") : "",
-                              /* purge old */
-                              _("  [P] Purge finished"),
-                              /* quit */
-                              _("  [Q] Close this buffer"));
-        }
+        weechat_printf_y (relay_buffer, 0,
+                          "%s%s%s%s%s%s%s",
+                          weechat_color("green"),
+                          _("Actions (letter+enter):"),
+                          weechat_color("lightgreen"),
+                          /* disconnect */
+                          (client_selected
+                           && !RELAY_CLIENT_HAS_ENDED(client_selected->status)) ?
+                          _("  [D] Disconnect") : "",
+                          /* remove */
+                          (client_selected
+                           && RELAY_CLIENT_HAS_ENDED(client_selected->status)) ?
+                          _("  [R] Remove") : "",
+                          /* purge old */
+                          _("  [P] Purge finished"),
+                          /* quit */
+                          _("  [Q] Close this buffer"));
         for (ptr_client = relay_clients; ptr_client;
              ptr_client = ptr_client->next_client)
         {
diff --git a/src/plugins/xfer/xfer-buffer.c b/src/plugins/xfer/xfer-buffer.c
index effaf4bc2..c936fecbe 100644
--- a/src/plugins/xfer/xfer-buffer.c
+++ b/src/plugins/xfer/xfer-buffer.c
@@ -56,28 +56,27 @@ xfer_buffer_refresh (const char *hotlist)
         weechat_buffer_clear (xfer_buffer);
         line = 0;
         xfer_selected = xfer_search_by_number (xfer_buffer_selected_line);
-        if (xfer_selected)
-        {
-            weechat_printf_y (xfer_buffer, 0,
-                              "%s%s%s%s%s%s%s%s",
-                              weechat_color("green"),
-                              _("Actions (letter+enter):"),
-                              weechat_color("lightgreen"),
-                              /* accept */
-                              (XFER_IS_RECV(xfer_selected->type)
-                               && (xfer_selected->status == XFER_STATUS_WAITING)) ?
-                              _("  [A] Accept") : "",
-                              /* cancel */
-                              (!XFER_HAS_ENDED(xfer_selected->status)) ?
-                              _("  [C] Cancel") : "",
-                              /* remove */
-                              (XFER_HAS_ENDED(xfer_selected->status)) ?
-                              _("  [R] Remove") : "",
-                              /* purge old */
-                              _("  [P] Purge finished"),
-                              /* quit */
-                              _("  [Q] Close this buffer"));
-        }
+        weechat_printf_y (xfer_buffer, 0,
+                          "%s%s%s%s%s%s%s%s",
+                          weechat_color("green"),
+                          _("Actions (letter+enter):"),
+                          weechat_color("lightgreen"),
+                          /* accept */
+                          (xfer_selected && XFER_IS_RECV(xfer_selected->type)
+                           && (xfer_selected->status == XFER_STATUS_WAITING)) ?
+                          _("  [A] Accept") : "",
+                          /* cancel */
+                          (xfer_selected
+                           && !XFER_HAS_ENDED(xfer_selected->status)) ?
+                          _("  [C] Cancel") : "",
+                          /* remove */
+                          (xfer_selected
+                           && XFER_HAS_ENDED(xfer_selected->status)) ?
+                          _("  [R] Remove") : "",
+                          /* purge old */
+                          _("  [P] Purge finished"),
+                          /* quit */
+                          _("  [Q] Close this buffer"));
         for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer)
         {
             suffix[0] = '\0';