diff --git a/js/core/view/control/dropdown.js b/js/core/view/control/dropdown.js
index 03f0a952..50bfa291 100644
--- a/js/core/view/control/dropdown.js
+++ b/js/core/view/control/dropdown.js
@@ -1,8 +1,9 @@
 define(function(require) {
 
-    var Protoplast = require('protoplast');
+    var Protoplast = require('protoplast'),
+        BaseComponent = require('core/view/base-component');
 
-    var Dropdown = Protoplast.Component.extend({
+    var Dropdown = BaseComponent.extend({
 
         html: '<select/>',
 
@@ -15,6 +16,8 @@ define(function(require) {
         },
 
         init: function() {
+            BaseComponent.init.call(this);
+
             Protoplast.utils.bind(this, 'value', this.updateValue.bind(this));
             Protoplast.utils.bind(this, 'options', this.setOptions.bind(this));
 
diff --git a/js/plugin/settings/model/settings-config-provider.js b/js/plugin/settings/model/settings-config-provider.js
index ba9fba20..28824aef 100644
--- a/js/plugin/settings/model/settings-config-provider.js
+++ b/js/plugin/settings/model/settings-config-provider.js
@@ -100,6 +100,7 @@ define(function(require) {
 
         createDropdown: function(key, label, options) {
             var dropdown = Dropdown.create();
+            dropdown.id = key;
             dropdown.options = options;
             return SettingsEntry.create(key, label, dropdown);
         },
diff --git a/test/acceptance/helper/browser.js b/test/acceptance/helper/browser.js
index 96413c0f..6550b612 100644
--- a/test/acceptance/helper/browser.js
+++ b/test/acceptance/helper/browser.js
@@ -30,7 +30,7 @@ define(function(require) {
         
         open_local_file: function(name, node) {
             node.files.item = function() {
-                return this.files[name]
+                return this.files[name];
             }.bind(this);
             this.trigger(node, 'change');
         },
diff --git a/test/acceptance/helper/dom/settings-dom-helper.js b/test/acceptance/helper/dom/settings-dom-helper.js
index b34a2dc3..87953e13 100644
--- a/test/acceptance/helper/dom/settings-dom-helper.js
+++ b/test/acceptance/helper/dom/settings-dom-helper.js
@@ -15,6 +15,11 @@ define(function(require) {
          */
         $load_last_opened: 'input[data-id="load_last_opened"]',
 
+        /**
+         * Font dropdown
+         */
+        $font_family: 'select[data-id="font_family"]',
+
         /**
          * JavaScript PDF Viewer checkbox
          */
@@ -25,7 +30,7 @@ define(function(require) {
          * @returns {boolean}
          */
         js_pdf_viewer_is_checked: function() {
-            return $(this.$js_pdf_viewer).prop('checked')
+            return $(this.$js_pdf_viewer).prop('checked');
         }
 
     });
diff --git a/test/acceptance/helper/user/base-user-helper.js b/test/acceptance/helper/user/base-user-helper.js
index da88dae4..e5803e51 100644
--- a/test/acceptance/helper/user/base-user-helper.js
+++ b/test/acceptance/helper/user/base-user-helper.js
@@ -28,7 +28,11 @@ define(function(require) {
                     throw new Error('Cannot click on selector "' + selector + '". Element not found.');
                 }
             }
-            this.browser.tick(20000);
+            // previously tick(20000), replaced with a series of ticks to fix loading fonts dynamically (too long
+            // single tick causes timeouts in requirejs()
+            for (var i=0; i<100; i++) {
+                this.browser.tick(20);
+            }
         },
         
         click_button: function(label) {
@@ -54,6 +58,11 @@ define(function(require) {
             options.which = options.which || 1;
 
             this.trigger_event(selector, type, options);
+        },
+
+        set_value: function(selector, value) {
+            $(selector).prop("value", value);
+            this.trigger_event(selector, "change");
         }
 
     });
diff --git a/test/acceptance/helper/user/settings-user-helper.js b/test/acceptance/helper/user/settings-user-helper.js
index a0e123ba..83f31fb8 100644
--- a/test/acceptance/helper/user/settings-user-helper.js
+++ b/test/acceptance/helper/user/settings-user-helper.js
@@ -16,6 +16,10 @@ define(function(require) {
          */
         select_open_last_used_on_startup: function() {
             this.click(this.dom.settings.$load_last_opened);
+        },
+
+        change_font_family: function(font_family) {
+            this.set_value(this.dom.settings.$font_family, font_family);
         }
         
     });
diff --git a/test/acceptance/spec/preview.js b/test/acceptance/spec/preview.js
index 4f00846c..4721e10c 100644
--- a/test/acceptance/spec/preview.js
+++ b/test/acceptance/spec/preview.js
@@ -2,13 +2,16 @@ define(function(require) {
 
     var Env = require('acceptance/env');
 
-    describe('Preview', function() {
+    describe('Preview', function () {
 
         var env;
 
-        beforeEach(function() {
+        beforeEach(function () {
             env = Env.create();
             env.scenarios.create_new_script('test');
+
+            env.user.theme.open_plugin("settings");
+            env.user.settings.change_font_family("Courier");
         });
 
         afterEach(function() {
@@ -115,6 +118,20 @@ define(function(require) {
             env.dropbox.enable();
         });
 
+        it('GIVEN embedded font is selected THEN the font is loaded dyamically', function (done) {
+
+            // GIVEN
+            env.user.theme.open_plugin('settings');
+            env.user.settings.change_font_family('CourierPrime');
+            env.user.theme.open_plugin('preview');
+
+            env.browser.wait(function() {
+                // THEN
+                env.assert.preview.preview_is_in_mode('embedded');
+                done();
+            }, 1000);
+        });
+
     });
 
 });
\ No newline at end of file