diff --git a/.storybook/config.js b/.storybook/config.js
index ea3f9302565f..4007932d1aa0 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -124,13 +124,6 @@ addDecorator(Story => <Story />);
 addDecorator(story => <I18n messages={messages}>{story()}</I18n>);
 
 configure(() => {
-  // Load sticker creator stories
-  const stickerCreatorContext = require.context(
-    '../sticker-creator',
-    true,
-    /\.stories\.tsx?$/
-  );
-  stickerCreatorContext.keys().forEach(f => stickerCreatorContext(f));
   // Load main app stories
   const tsComponentsContext = require.context(
     '../ts/components',
@@ -138,4 +131,11 @@ configure(() => {
     /\.stories.tsx?$/
   );
   tsComponentsContext.keys().forEach(f => tsComponentsContext(f));
+  // Load sticker creator stories
+  const stickerCreatorContext = require.context(
+    '../sticker-creator',
+    true,
+    /\.stories\.tsx?$/
+  );
+  stickerCreatorContext.keys().forEach(f => stickerCreatorContext(f));
 }, module);
diff --git a/ts/components/emoji/EmojiButton.stories.tsx b/ts/components/emoji/EmojiButton.stories.tsx
index b4865ac2304c..3555b15f2f72 100644
--- a/ts/components/emoji/EmojiButton.stories.tsx
+++ b/ts/components/emoji/EmojiButton.stories.tsx
@@ -11,7 +11,7 @@ import { EmojiButton } from './EmojiButton';
 
 const i18n = setupI18n('en', enMessages);
 
-storiesOf('Components/emojis/EmojiButton', module).add('Base', () => {
+storiesOf('Components/Emoji/EmojiButton', module).add('Base', () => {
   return (
     <div
       style={{
diff --git a/ts/components/emoji/EmojiPicker.stories.tsx b/ts/components/emoji/EmojiPicker.stories.tsx
index f8c458d62cce..793d3d507d36 100644
--- a/ts/components/emoji/EmojiPicker.stories.tsx
+++ b/ts/components/emoji/EmojiPicker.stories.tsx
@@ -11,7 +11,7 @@ import { EmojiPicker } from './EmojiPicker';
 
 const i18n = setupI18n('en', enMessages);
 
-storiesOf('Components/emojis/EmojiPicker', module)
+storiesOf('Components/Emoji/EmojiPicker', module)
   .add('Base', () => {
     return (
       <EmojiPicker
diff --git a/ts/components/stickers/StickerPreviewModal.stories.tsx b/ts/components/stickers/StickerPreviewModal.stories.tsx
index 9c5c626d9336..dc98f6583b34 100644
--- a/ts/components/stickers/StickerPreviewModal.stories.tsx
+++ b/ts/components/stickers/StickerPreviewModal.stories.tsx
@@ -16,7 +16,7 @@ import { action } from '@storybook/addon-actions';
 
 const i18n = setupI18n('en', enMessages);
 
-storiesOf('stickers', module).add('StickerPreviewModal', () => {
+storiesOf('Components/Stickers/StickerPreviewModal', module).add('Full', () => {
   const title = text('title', 'Foo');
   const author = text('author', 'Foo McBarrington');
   const abeSticker = {