diff --git a/app.js b/app.js
index 363498f..c9fb8ae 100644
--- a/app.js
+++ b/app.js
@@ -11,7 +11,8 @@ var express = require('express')
   , db = require('./lib/database')
   , package_metadata = require('./package.json')
   , locale = require('./lib/locale')
-  , request = require('postman-request');
+  , request = require('postman-request')
+  , fs = require('fs');
 
 var app = express();
 
@@ -335,6 +336,21 @@ for (var i=1; i<6; i++) {
   app.set('panel'+i.toString(), ((panelorder.length >= i) ? panelorder[i-1].name : ''));
 }
 
+// Dynamically populate market names
+var market_names = {};
+
+settings.markets.enabled.forEach(function (market) {
+  // Check if market file exists
+  if (fs.existsSync('./lib/markets/' + market + '.js')) {
+    // Load market file
+    var exMarket = require('./lib/markets/' + market);
+    // Save market_name from market file to settings
+    eval('market_names.' + market + ' = "' + exMarket.market_name + '";');
+  }
+});
+
+app.set('market_names', market_names);
+
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
     var err = new Error('Not Found');
diff --git a/views/market.pug b/views/market.pug
index aa3a48d..6c3329c 100644
--- a/views/market.pug
+++ b/views/market.pug
@@ -28,12 +28,13 @@ block content
             .card-body
               ul.nav.nav-pills
                 each mkt in settings.markets.enabled
-                  if market == mkt
-                    li.nav-item
-                      a.nav-link.active(href='/markets/' + mkt) #{mkt}
-                  else
-                    li.nav-item
-                      a.nav-link(href='/markets/' + mkt) #{mkt}
+                  if settings.market_names[mkt] != null
+                    if market == mkt
+                      li.nav-item
+                        a.nav-link.active(href='/markets/' + mkt) #{settings.market_names[mkt]}
+                    else
+                      li.nav-item
+                        a.nav-link(href='/markets/' + mkt) #{settings.market_names[mkt]}
     block market_view
       script.
         $(document).ready(function() {