diff --git a/package.json b/package.json
index d1e6e2b..8362817 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,8 @@
     "prepublishOnly": "npm run build",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
-    "prettier": "prettier --write \"{src,scripts,spec}/**/*.js\""
+    "prettier": "prettier --write \"{src,scripts,spec}/**/*.js\"",
+    "prepare": "npm run build:dist"
   },
   "size-limit": [
     {
diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js
index e5acf3f..1b8c120 100644
--- a/src/components/picker/nimble-picker.js
+++ b/src/components/picker/nimble-picker.js
@@ -566,7 +566,7 @@ export default class NimblePicker extends React.PureComponent {
           })}
         </div>
 
-        {showPreview && (
+        {(showPreview || showSkinTones) && (
           <div className="emoji-mart-bar">
             <Preview
               ref={this.setPreviewRef}
@@ -574,6 +574,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 23ee8d6..a4904b1 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 = [],