diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 57510596d0..dfc9ed94c0 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -409,7 +409,10 @@ bool RbUtilQt::smallInstallInner()
     }
     // Bootloader
     devices->beginGroup(userSettings->value("platform").toString());
-    if(devices->value("needsbootloader", "") == "yes") {
+    QString needBootloader = devices->value("needsbootloader", "").toString();
+    devices->endGroup();
+    if(needBootloader == "yes") 
+    {
         m_error = false;
         m_installed = false;
         if(!installBootloaderAuto())
@@ -422,8 +425,7 @@ bool RbUtilQt::smallInstallInner()
         }
         if(m_error) return true;
         logger->undoAbort();
-    }
-    devices->endGroup();
+    }    
 
     // Rockbox
     m_error = false;