diff --git a/src/Config.h b/src/Config.h
index 4e15b8f9..3e85e98f 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					2
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					2
-#define VER_LAMEXP_BUILD					538
+#define VER_LAMEXP_BUILD					539
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 6afb93a3..a87157ac 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -918,9 +918,9 @@ void MainWindow::windowShown(void)
 	}
 
 	//Check for AAC support
-	if(m_settings->neroAacNotificationsEnabled())
+	if(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe"))
 	{
-		if(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe"))
+		if(m_settings->neroAacNotificationsEnabled())
 		{
 			if(lamexp_tool_version("neroAacEnc.exe") < lamexp_toolver_neroaac())
 			{
@@ -932,9 +932,12 @@ void MainWindow::windowShown(void)
 				QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText);
 			}
 		}
-		else
+	}
+	else
+	{
+		radioButtonEncoderAAC->setEnabled(false);
+		if(m_settings->neroAacNotificationsEnabled())
 		{
-			radioButtonEncoderAAC->setEnabled(false);
 			QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath();
 			if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath();
 			QString messageText;