diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index f3a20ab88..29eee9c34 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -3032,6 +3032,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
 
   connect( device, TQT_SIGNAL( textChanged( const TQString & ) ),
            this, TQT_SLOT( slotDeviceChanged() ) );
+
+  processLockouts();
 }
 
 KDevicePropsPlugin::~KDevicePropsPlugin()
@@ -3044,6 +3046,18 @@ KDevicePropsPlugin::~KDevicePropsPlugin()
 //   return i18n ("De&vice");
 // }
 
+void KDevicePropsPlugin::processLockouts()
+{
+  if (device->currentText().stripWhiteSpace() != "")
+  {
+    properties->enableButtonOK(true);
+  }
+  else
+  {
+    properties->enableButtonOK(false);
+  }
+}
+
 void KDevicePropsPlugin::updateInfo()
 {
   // we show it in the slot when we know the values
@@ -3061,6 +3075,8 @@ void KDevicePropsPlugin::updateInfo()
 
     job->readDF( mountpoint->text() );
   }
+
+  processLockouts();
 }
 
 void KDevicePropsPlugin::slotActivated( int index )
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index 4243bf602..fa0abec1c 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -740,6 +740,7 @@ private slots:
 
 private:
   void updateInfo();
+  void processLockouts();
 
 private:
   TQComboBox* device;