diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index d48738256..859c86fed 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -699,6 +699,13 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device)
 void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, TQString uuid) {
 	TDEGenericDevice *hwdevice;
 	if (uuid.startsWith("ADD: ")) {
+		TDEConfig config("mediamanagerrc");
+		config.setGroup("Global");
+		if (config.readBoolEntry("NotificationPopupsEnabled", true))
+		{
+			return;
+		}
+
 		uuid = uuid.right(uuid.length() - strlen("ADD: "));
 		if (uuid != "") {
 			TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();