diff --git a/scss/_type.scss b/scss/_type.scss
index 1d55ccb2d7..2b0a2567c7 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -133,27 +133,27 @@ mark,
   margin-bottom: $spacer;
   font-size: $blockquote-font-size;
   border-left: .25rem solid $blockquote-border-color;
+}
 
-  p,
-  ul,
-  ol {
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  footer {
-    display: block;
-    font-size: 80%; // back to default font-size
-    line-height: $line-height;
-    color: $blockquote-small-color;
-
-    &::before {
-      content: "\2014 \00A0"; // em dash, nbsp
-    }
+.blockquote-text,
+.blockquote-list // ul, ol
+ {
+  &:last-child {
+    margin-bottom: 0;
   }
 }
 
+.blockquote-footer {
+  display: block;
+  font-size: 80%; // back to default font-size
+  line-height: $line-height;
+  color: $blockquote-small-color;
+
+  &::before {
+    content: "\2014 \00A0"; // em dash, nbsp
+  }
+ }
+
 // Opposite alignment of blockquote
 .blockquote-reverse {
   padding-right: $spacer;
@@ -161,13 +161,14 @@ mark,
   text-align: right;
   border-right: .25rem solid $blockquote-border-color;
   border-left: 0;
+}
 
-  // Account for citation
-  footer {
-    &::before { content: ""; }
-    &::after {
-      content: "\00A0 \2014"; // nbsp, em dash
-    }
+.blockquote-reverse .blockquote-footer {
+  &::before {
+    content: "";
+  }
+  &::after {
+    content: "\00A0 \2014"; // nbsp, em dash
   }
 }