diff --git a/src/components/main/ForwardPicker.scss b/src/components/main/ForwardPicker.scss
index 81189c554..70a6e0241 100644
--- a/src/components/main/ForwardPicker.scss
+++ b/src/components/main/ForwardPicker.scss
@@ -58,4 +58,17 @@
     justify-content: center;
     color: var(--color-text-secondary);
   }
+
+  .ListItem.chat-item-clickable {
+    &:not(.force-rounded-corners) {
+      @media (max-width: 600px) {
+        margin: 0;
+
+        .ListItem-button {
+          border-radius: 0;
+        }
+      }
+    }
+
+  }
 }
diff --git a/src/components/ui/ListItem.scss b/src/components/ui/ListItem.scss
index 1bae34dd2..124d9b05d 100644
--- a/src/components/ui/ListItem.scss
+++ b/src/components/ui/ListItem.scss
@@ -113,16 +113,6 @@
       padding: .5625rem .6975rem .5625rem .5625rem;
     }
 
-    &:not(.force-rounded-corners) {
-      @media (max-width: 600px) {
-        margin: 0;
-
-        .ListItem-button {
-          border-radius: 0;
-        }
-      }
-    }
-
     .Avatar {
       flex-shrink: 0;
       margin-right: 0.5rem;