diff --git a/src/servers/ManageServersRowDropdown.tsx b/src/servers/ManageServersRowDropdown.tsx
index 60c46ab1..a2bd5c5a 100644
--- a/src/servers/ManageServersRowDropdown.tsx
+++ b/src/servers/ManageServersRowDropdown.tsx
@@ -37,23 +37,25 @@ const ManageServersRowDropdown: FCWithDeps<ManageServersRowDropdownConnectProps,
   const autoConnectIcon = isAutoConnect ? toggleOffIcon : toggleOnIcon;
 
   return (
-    <RowDropdownBtn minWidth={isAutoConnect ? 210 : 170}>
-      <DropdownItem tag={Link} to={serverUrl}>
-        <FontAwesomeIcon icon={connectIcon} fixedWidth /> Connect
-      </DropdownItem>
-      <DropdownItem tag={Link} to={`${serverUrl}/edit`}>
-        <FontAwesomeIcon icon={editIcon} fixedWidth /> Edit server
-      </DropdownItem>
-      <DropdownItem onClick={() => setAutoConnect(server, !isAutoConnect)}>
-        <FontAwesomeIcon icon={autoConnectIcon} fixedWidth /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
-      </DropdownItem>
-      <DropdownItem divider tag="hr" />
-      <DropdownItem className="tw:text-danger" onClick={showModal}>
-        <FontAwesomeIcon icon={deleteIcon} fixedWidth /> Remove server
-      </DropdownItem>
+    <>
+      <RowDropdownBtn minWidth={isAutoConnect ? 210 : 170}>
+        <DropdownItem tag={Link} to={serverUrl}>
+          <FontAwesomeIcon icon={connectIcon} fixedWidth /> Connect
+        </DropdownItem>
+        <DropdownItem tag={Link} to={`${serverUrl}/edit`}>
+          <FontAwesomeIcon icon={editIcon} fixedWidth /> Edit server
+        </DropdownItem>
+        <DropdownItem onClick={() => setAutoConnect(server, !isAutoConnect)}>
+          <FontAwesomeIcon icon={autoConnectIcon} fixedWidth /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
+        </DropdownItem>
+        <DropdownItem divider tag="hr" />
+        <DropdownItem className="tw:text-danger" onClick={showModal}>
+          <FontAwesomeIcon icon={deleteIcon} fixedWidth /> Remove server
+        </DropdownItem>
+      </RowDropdownBtn>
 
       <DeleteServerModal server={server} open={isModalOpen} onClose={hideModal} />
-    </RowDropdownBtn>
+    </>
   );
 };
 
diff --git a/src/servers/ServersDropdown.tsx b/src/servers/ServersDropdown.tsx
index 577a89d2..099a2c2e 100644
--- a/src/servers/ServersDropdown.tsx
+++ b/src/servers/ServersDropdown.tsx
@@ -13,36 +13,30 @@ export interface ServersDropdownProps {
 export const ServersDropdown = ({ servers, selectedServer }: ServersDropdownProps) => {
   const serversList = Object.values(servers);
 
-  const renderServers = () => {
-    if (serversList.length === 0) {
-      return (
-        <DropdownItem tag={Link} to="/server/create">
-          <FontAwesomeIcon icon={plusIcon} /> <span className="tw:ml-1">Add a server</span>
-        </DropdownItem>
-      );
-    }
-
-    return (
-      <>
-        {serversList.map(({ name, id }) => (
-          <DropdownItem key={id} tag={Link} to={`/server/${id}`} active={getServerId(selectedServer) === id}>
-            {name}
-          </DropdownItem>
-        ))}
-        <DropdownItem divider tag="hr" />
-        <DropdownItem tag={Link} to="/manage-servers">
-          <FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Manage servers</span>
-        </DropdownItem>
-      </>
-    );
-  };
-
   return (
     <UncontrolledDropdown nav inNavbar>
       <DropdownToggle nav caret>
         <FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Servers</span>
       </DropdownToggle>
-      <DropdownMenu end className="tw:right-0">{renderServers()}</DropdownMenu>
+      <DropdownMenu end className="tw:right-0">
+        {serversList.length === 0 ? (
+          <DropdownItem tag={Link} to="/server/create">
+            <FontAwesomeIcon icon={plusIcon} /> <span className="tw:ml-1">Add a server</span>
+          </DropdownItem>
+        ) : (
+          <>
+            {serversList.map(({ name, id }) => (
+              <DropdownItem key={id} tag={Link} to={`/server/${id}`} active={getServerId(selectedServer) === id}>
+                {name}
+              </DropdownItem>
+            ))}
+            <DropdownItem divider tag="hr" />
+            <DropdownItem tag={Link} to="/manage-servers">
+              <FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Manage servers</span>
+            </DropdownItem>
+          </>
+        )}
+      </DropdownMenu>
     </UncontrolledDropdown>
   );
 };
diff --git a/test/servers/__snapshots__/ManageServersRowDropdown.test.tsx.snap b/test/servers/__snapshots__/ManageServersRowDropdown.test.tsx.snap
index d597f4bd..a88b7687 100644
--- a/test/servers/__snapshots__/ManageServersRowDropdown.test.tsx.snap
+++ b/test/servers/__snapshots__/ManageServersRowDropdown.test.tsx.snap
@@ -35,113 +35,12 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 1`] = `
       role="menu"
       style="min-width: 210px;"
       tabindex="-1"
-    >
-      <a
-        class="dropdown-item"
-        data-discover="true"
-        href="/server/abc123"
-        role="menuitem"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-plug fa-fw "
-          data-icon="plug"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 384 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M96 0C78.3 0 64 14.3 64 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM288 0c-17.7 0-32 14.3-32 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM32 160c-17.7 0-32 14.3-32 32s14.3 32 32 32l0 32c0 77.4 55 142 128 156.8l0 67.2c0 17.7 14.3 32 32 32s32-14.3 32-32l0-67.2C297 398 352 333.4 352 256l0-32c17.7 0 32-14.3 32-32s-14.3-32-32-32L32 160z"
-            fill="currentColor"
-          />
-        </svg>
-         Connect
-      </a>
-      <a
-        class="dropdown-item"
-        data-discover="true"
-        href="/server/abc123/edit"
-        role="menuitem"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-pen-to-square fa-fw "
-          data-icon="pen-to-square"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"
-            fill="currentColor"
-          />
-        </svg>
-         Edit server
-      </a>
-      <button
-        class="dropdown-item"
-        role="menuitem"
-        tabindex="0"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-ban fa-fw "
-          data-icon="ban"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M367.2 412.5L99.5 144.8C77.1 176.1 64 214.5 64 256c0 106 86 192 192 192c41.5 0 79.9-13.1 111.2-35.5zm45.3-45.3C434.9 335.9 448 297.5 448 256c0-106-86-192-192-192c-41.5 0-79.9 13.1-111.2 35.5L412.5 367.2zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256z"
-            fill="currentColor"
-          />
-        </svg>
-         
-        Do not a
-        uto-connect
-      </button>
-      <hr
-        class="dropdown-divider"
-        tabindex="-1"
-      />
-      <button
-        class="tw:text-danger dropdown-item"
-        role="menuitem"
-        tabindex="0"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-circle-minus fa-fw "
-          data-icon="circle-minus"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM184 232l144 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-144 0c-13.3 0-24-10.7-24-24s10.7-24 24-24z"
-            fill="currentColor"
-          />
-        </svg>
-         Remove server
-      </button>
-      <span>
-        DeleteServerModal 
-        [CLOSED]
-      </span>
-    </div>
+    />
   </div>
+  <span>
+    DeleteServerModal 
+    [CLOSED]
+  </span>
 </div>
 `;
 
@@ -180,112 +79,11 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 2`] = `
       role="menu"
       style="min-width: 170px;"
       tabindex="-1"
-    >
-      <a
-        class="dropdown-item"
-        data-discover="true"
-        href="/server/abc123"
-        role="menuitem"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-plug fa-fw "
-          data-icon="plug"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 384 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M96 0C78.3 0 64 14.3 64 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM288 0c-17.7 0-32 14.3-32 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM32 160c-17.7 0-32 14.3-32 32s14.3 32 32 32l0 32c0 77.4 55 142 128 156.8l0 67.2c0 17.7 14.3 32 32 32s32-14.3 32-32l0-67.2C297 398 352 333.4 352 256l0-32c17.7 0 32-14.3 32-32s-14.3-32-32-32L32 160z"
-            fill="currentColor"
-          />
-        </svg>
-         Connect
-      </a>
-      <a
-        class="dropdown-item"
-        data-discover="true"
-        href="/server/abc123/edit"
-        role="menuitem"
-        tabindex="0"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-pen-to-square fa-fw "
-          data-icon="pen-to-square"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"
-            fill="currentColor"
-          />
-        </svg>
-         Edit server
-      </a>
-      <button
-        class="dropdown-item"
-        role="menuitem"
-        tabindex="0"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-circle fa-fw "
-          data-icon="circle"
-          data-prefix="far"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M464 256A208 208 0 1 0 48 256a208 208 0 1 0 416 0zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256z"
-            fill="currentColor"
-          />
-        </svg>
-         
-        A
-        uto-connect
-      </button>
-      <hr
-        class="dropdown-divider"
-        tabindex="-1"
-      />
-      <button
-        class="tw:text-danger dropdown-item"
-        role="menuitem"
-        tabindex="0"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="svg-inline--fa fa-circle-minus fa-fw "
-          data-icon="circle-minus"
-          data-prefix="fas"
-          focusable="false"
-          role="img"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM184 232l144 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-144 0c-13.3 0-24-10.7-24-24s10.7-24 24-24z"
-            fill="currentColor"
-          />
-        </svg>
-         Remove server
-      </button>
-      <span>
-        DeleteServerModal 
-        [CLOSED]
-      </span>
-    </div>
+    />
   </div>
+  <span>
+    DeleteServerModal 
+    [CLOSED]
+  </span>
 </div>
 `;