=== SqueezeCenterApplet.lua
==================================================================
--- SqueezeCenterApplet.lua	(revision 38997)
+++ SqueezeCenterApplet.lua	(local)
@@ -34,7 +34,7 @@
 function init(self)
 	self.mountedDevices = self:getSettings()['mountedDevices']
 	self.ejectItems     = {}
-	self.MOUNTING_DRIVE_TIMEOUT = 30
+	self.MOUNTING_DRIVE_TIMEOUT = 20
 	self.UNMOUNTING_DRIVE_TIMEOUT = 10
 	self.WIPE_TIMEOUT = 60
 	self.supportedFormats = {"FAT16","FAT32","NTFS","ext2","ext3"}
@@ -425,6 +425,19 @@
 	local sublabel = Label("subtext", self:string(token) )
 	popup:addWidget(sublabel)
 
+        --make sure this popup remains on screen
+	popup:setAllowScreensaver(false)
+	popup:setAlwaysOnTop(true)
+	popup:setAutoHide(false)
+	popup:setTransparent(false)
+	-- no way to exit this popup
+	self.mountListener = Framework:addListener(EVENT_ALL_INPUT,
+		function()
+			return EVENT_CONSUME
+		end,
+		true
+	)
+
 	self.popupMountWaiting = popup
 	self:tieAndShowWindow(popup)
 	return popup
@@ -586,8 +599,8 @@
 
 			self:addMountedDevice(devName, isScDrive)
 
+			self:_addEjectDeviceItem(devName)
 			self:_ejectWarning(devName)
-			self:_addEjectDeviceItem(devName)
 		else
 			-- Not yet mounted
 			self.mountingDriveTimeout = self.mountingDriveTimeout + 1
@@ -603,6 +616,7 @@
 
 		self.popupMountWaiting:hide()
 		self.popupMountWaiting = nil
+		Framework:removeListener(self.mountListener)
 
 	end):addTask()
 end