diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index 4b47f73a..8d325297 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -435,10 +435,12 @@ void UBApplication::decorateActionMenu(QAction* action)
 
             // SANKORE-48: Hide the check update action if the setting
             // EnableAutomaticSoftwareUpdates is false in Uniboard.config
-            if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool())
-            {
+            if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool()){
                 menu->addAction(mainWindow->actionCheckUpdate);
             }
+            else{
+                mainWindow->actionCheckUpdate->setEnabled(false);
+            }
 
 #ifndef Q_WS_X11 // No Podcast on Linux yet
             menu->addAction(mainWindow->actionPodcast);