diff --git a/ui/.storybook/config.js b/ui/.storybook/config.js
index 404a63a1..61c63a83 100644
--- a/ui/.storybook/config.js
+++ b/ui/.storybook/config.js
@@ -3,7 +3,13 @@ const { configure } = require('@kadira/storybook');
 const req = require.context('../src/components', true, /story.js$/)
 
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  let stories = req.keys();
+      stories = stories.sort();
+
+  stories.forEach( story => req(story));
+
+  // Fallback to stories/index.js file for anything that
+  // hasn't been moved
   require('../stories');
 }