diff --git a/src/components/Messages/Messages.css b/src/components/Messages/Messages.css
index 7650553e..51fc8ca2 100644
--- a/src/components/Messages/Messages.css
+++ b/src/components/Messages/Messages.css
@@ -2,15 +2,17 @@
 
 .root {
   margin: 0;
-}
 
-.root:after {
+  /* Clearfix */
   @apply --clearfix;
 }
 
 .messageItem {
   margin-bottom: 35px;
 
+  /* Clearfix */
+  @apply --clearfix;
+
   @media (--viewportMedium) {
     margin-bottom: 40px;
   }
@@ -20,10 +22,6 @@
   }
 }
 
-.messageItem:after {
-  @apply --clearfix;
-}
-
 .message,
 .ownMessage {
   /* Preserve newlines, but collapse other whitespace */
diff --git a/src/marketplace.css b/src/marketplace.css
index 605e4374..9e4a8495 100644
--- a/src/marketplace.css
+++ b/src/marketplace.css
@@ -98,12 +98,12 @@
 
   /* ================ Clearfix solution ================ */
 
-  /* Apply to an :after pseudo element of the container where
-   * the clearfix effect is desired */
   --clearfix {
-    content: '';
-    display: table;
-    clear: both;
+    &:after {
+      content: '';
+      display: table;
+      clear: both;
+    }
   }
 
   /* ================ Links ================ */