diff --git a/manifest.json b/manifest.json
index f0e07a28..8cb45a4a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "minimum_chrome_version": "36",
-    "version": "0.54",
+    "version": "0.54.1",
 
     "author": "cTn",
     "name": "Baseflight - Configurator",
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 343067e5..b84451b9 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -2,7 +2,7 @@
     <div class="leftWrapper">
         <div class="groupTitle" i18n="configurationMixer"></div>
         <div class="mixerPreview">
-            <img src="./images/motor_order/custom.svg" />
+            <img src="./resources/motor_order/custom.svg" />
             <select class="mixerList">
                 <!-- list generated here -->
             </select>
diff --git a/tabs/configuration.js b/tabs/configuration.js
index fcdd1ec0..4136b345 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -2,7 +2,7 @@
 
 TABS.configuration = {};
 
-TABS.configuration.initialize = function (callback) {
+TABS.configuration.initialize = function (callback, scrollPosition) {
     var self = this;
 
     if (GUI.active_tab != 'configuration') {
@@ -194,6 +194,11 @@ TABS.configuration.initialize = function (callback) {
         // select current serial RX type
         serialRX_e.val(BF_CONFIG.serialrx_type);
 
+        // for some odd reason chrome 38+ changes scroll according to the touched select element
+        // i am guessing this is a bug, since this wasn't happening on 37
+        // code below is a temporary fix, which we will be able to remove in the future (hopefully)
+        $('#content').scrollTop((scrollPosition) ? scrollPosition : 0);
+
         // fill board alignment
         $('input[name="board_align_roll"]').val(BF_CONFIG.board_align_roll);
         $('input[name="board_align_pitch"]').val(BF_CONFIG.board_align_pitch);
@@ -287,7 +292,7 @@ TABS.configuration.initialize = function (callback) {
                 GUI.timeout_add('waiting_for_bootup', function waiting_for_bootup() {
                     MSP.send_message(MSP_codes.MSP_IDENT, false, false, function () {
                         GUI.log(chrome.i18n.getMessage('deviceReady'));
-                        TABS.configuration.initialize();
+                        TABS.configuration.initialize(false, $('#content').scrollTop());
                     });
                 }, 1500); // 1500 ms seems to be just the right amount of delay to prevent data request timeouts
             }