diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js
index 24c0ff4..6f9c2e5 100644
--- a/src/components/picker/nimble-picker.js
+++ b/src/components/picker/nimble-picker.js
@@ -560,7 +560,7 @@ export default class NimblePicker extends React.PureComponent {
           })}
         </div>
 
-        {showPreview && (
+        {(showPreview || showSkinTones) && (
           <div className="emoji-mart-bar">
             <Preview
               ref={this.setPreviewRef}
@@ -568,6 +568,7 @@ export default class NimblePicker extends React.PureComponent {
               title={title}
               emoji={emoji}
               showSkinTones={showSkinTones}
+              showPreview={showPreview}
               emojiProps={{
                 native: native,
                 size: 38,
diff --git a/src/components/preview.js b/src/components/preview.js
index e9ab5ae..7c92d4e 100644
--- a/src/components/preview.js
+++ b/src/components/preview.js
@@ -23,9 +23,10 @@ export default class Preview extends React.PureComponent {
         title,
         emoji: idleEmoji,
         i18n,
+        showPreview,
       } = this.props
 
-    if (emoji) {
+    if (emoji && showPreview) {
       var emojiData = getData(emoji, null, null, this.data),
         { emoticons = [] } = emojiData,
         knownEmoticons = [],