diff --git a/CHANGELOG.md b/CHANGELOG.md
index 630233d3..fcbe86c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ This file should follow the standards specified on [keepachangelog.com](http://k
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
+### Fixed
+* Hotfixed navigation bar issue causing crashes ([#604](https://github.com/radiant-player/radiant-player-mac/pull/604))
 
 ## [1.10.2] - 2016-08-19
 ### Fixed
diff --git a/radiant-player-mac/js/navigation.js b/radiant-player-mac/js/navigation.js
index 7696eae5..c7274d14 100644
--- a/radiant-player-mac/js/navigation.js
+++ b/radiant-player-mac/js/navigation.js
@@ -67,6 +67,11 @@ if (typeof window.GMNavigation === 'undefined') {
     buttonsContainer.parentNode.insertBefore(paddingElement, buttonsContainer);
 
     // Adjust the drawer navigation scrolling mode to accomodate the traffic light buttons.
-    var el = document.querySelector('#drawer #nav-container');
-    if (el) el.setAttribute('mode', '');
+    var navContainer = document.querySelector('#drawer #nav-container');
+    if (navContainer) {
+      navContainer.removeAttribute('mode');
+      var mode = document.createAttribute('mode');
+      mode.value = '';
+      navContainer.setAttributeNode(mode);
+    }
 }