diff --git a/plasmoid/package/contents/ui/Battery.qml b/plasmoid/package/contents/ui/Battery.qml
index 09a6a09c4..50adcd8c6 100644
--- a/plasmoid/package/contents/ui/Battery.qml
+++ b/plasmoid/package/contents/ui/Battery.qml
@@ -39,13 +39,13 @@ QtObject {
     property variant nested1: DBusAsyncResponse {
         id: startupCheck1
         autoDelete: false
-        onSuccess: charging = result
+        onSuccess: root.charging = result
     }
     
     property variant nested2: DBusAsyncResponse {
         id: startupCheck2
         autoDelete: false
-        onSuccess: charge = result
+        onSuccess: root.charge = result
     }
     
     onAvailableChanged: {
diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml
index e522146f3..d38d651be 100644
--- a/plasmoid/package/contents/ui/DeviceDelegate.qml
+++ b/plasmoid/package/contents/ui/DeviceDelegate.qml
@@ -54,11 +54,14 @@ PlasmaComponents.ListItem
                     },
                     State {
                         name: "MOUNTING"
-                        PropertyChanges { target: browse; checked: true; text: i18n("Mounting...") }
+			// TODO make apropriate icons
+                        //PropertyChanges { target: browse; checked: true; text: i18n("Mounting...") }
+                        PropertyChanges { target: browse; checked: false; text: i18n("Browse") }
                     },
                     State {
                         name: "MOUNTED"
-                        PropertyChanges { target: browse; checked: false; text: i18n("Unmount") }
+                        //PropertyChanges { target: browse; checked: false; text: i18n("Unmount") }
+                        PropertyChanges { target: browse; checked: false; text: i18n("Browse") }
                     }
                 ]
 
@@ -74,12 +77,13 @@ PlasmaComponents.ListItem
                 onClicked: {
                     if (state == "UNMOUNTED") {
                         state = "MOUNTING"
-                        sftp.browse()
+                        //sftp.browse()
                     }
                     else if (state == "MOUNTED") {
-                        sftp.unmount()
+                        //sftp.unmount()
                         state = "UNMOUNTED"
                     }
+                    sftp.browse()
                 }
             }