diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
index 970a57bb2..1202cd371 100644
--- a/client/app/scripts/actions/app-actions.js
+++ b/client/app/scripts/actions/app-actions.js
@@ -25,8 +25,9 @@ export function toggleHelp() {
   return (dispatch, getState) => {
     if (getState().get('showingHelp')) {
       dispatch(hideHelp());
+    } else {
+      dispatch(showHelp());
     }
-    dispatch(showHelp());
   };
 }
 
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index 95ae08f87..4698cb5cb 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -62,6 +62,7 @@ module.exports = {
     new webpack.optimize.CommonsChunkPlugin('vendors', 'vendors.js'),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
+    new webpack.IgnorePlugin(/^\.\/locale$/, [/moment$/]),
     new HtmlWebpackPlugin({
       chunks: ['vendors', 'contrast-app'],
       template: 'app/html/index.html',
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 8b2fb4c14..21ad03ef0 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -87,6 +87,7 @@ module.exports = {
     new webpack.DefinePlugin(GLOBALS),
     new webpack.optimize.CommonsChunkPlugin('vendors', 'vendors.js'),
     new webpack.optimize.OccurenceOrderPlugin(true),
+    new webpack.IgnorePlugin(/^\.\/locale$/, [/moment$/]),
     new webpack.optimize.UglifyJsPlugin({
       sourceMap: false,
       compress: {