diff --git a/autotests/kfileplacesmodeltest.cpp b/autotests/kfileplacesmodeltest.cpp
--- a/autotests/kfileplacesmodeltest.cpp
+++ b/autotests/kfileplacesmodeltest.cpp
@@ -177,7 +177,8 @@
 static const QStringList initialListOfUrls()
 {
     return QStringList() << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-                         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+                         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+                         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
 }
 
 void KFilePlacesModelTest::testInitialList()
@@ -338,7 +339,8 @@
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
 
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
@@ -358,7 +360,8 @@
 
     urls.clear();
     urls << QStringLiteral("remote:/") << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
 
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
@@ -377,7 +380,8 @@
     bookmarkManager->emitChanged(root);
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
@@ -409,7 +413,8 @@
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") << QStringLiteral("remote:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
@@ -429,7 +434,8 @@
 
     urls.clear();
     urls << QStringLiteral("remote:/") << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
@@ -449,7 +455,8 @@
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
@@ -483,7 +490,8 @@
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") <<  QStringLiteral("/home/foo")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
 
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
@@ -502,8 +510,9 @@
     bookmarkManager->emitChanged(root);
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/home/foo")
-         << QStringLiteral("trash:/") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/home/foo") << QStringLiteral("trash:/")
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
@@ -519,8 +528,9 @@
     m_places->editPlace(m_places->index(3, 0), QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/mnt/foo")));
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo")
-         << QStringLiteral("trash:/") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
@@ -534,8 +544,9 @@
     bookmarkManager->notifyCompleteChange(QString());
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo")
-         << QStringLiteral("trash:/") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 0);
@@ -549,7 +560,8 @@
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
@@ -561,9 +573,9 @@
     m_places->addPlace(QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/home/foo")), QString(), QString(), m_places->index(1, 0));
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral("/home/foo") << QStringLiteral(KDE_ROOT_PATH)
-         << QStringLiteral("trash:/") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
-
+    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral("/home/foo") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
@@ -585,80 +597,91 @@
 
     QStringList urls;
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0")  << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 6);
-    QCOMPARE(args.at(2).toInt(), 6);
+    QCOMPARE(args.at(1).toInt(), 7);
+    QCOMPARE(args.at(2).toInt(), 7);
 
     fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 6);
-    QCOMPARE(args.at(2).toInt(), 6);
+    QCOMPARE(args.at(1).toInt(), 7);
+    QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 0);
 
     // Move the device in the list, and check that it memorizes the position across plug/unplug
 
     KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
     KBookmarkGroup root = bookmarkManager->root();
-    KBookmark before_nfs = m_places->bookmarkForIndex(m_places->index(3, 0));
+    KBookmark before_floppy;
+
     KBookmark device = root.first(); // The device we'll move is the 7th bookmark
     for (int i = 0; i < 6; i++) {
-        device = root.next(device);
+        if (i == 3) {
+            // store item before to be able to move it back to original position
+            device = before_floppy = root.next(device);
+        } else {
+            device = root.next(device);
+        }
     }
 
-    root.moveBookmark(device, before_nfs);
+    root.moveBookmark(device, before_floppy);
     bookmarkManager->emitChanged(root);
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 4);
-    QCOMPARE(args.at(2).toInt(), 4);
+    QCOMPARE(args.at(1).toInt(), 7);
+    QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 7);
-    QCOMPARE(args.at(2).toInt(), 7);
+    QCOMPARE(args.at(1).toInt(), 6);
+    QCOMPARE(args.at(2).toInt(), 6);
 
     fakeManager()->call(QStringLiteral("unplug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
-    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH)
-         << QStringLiteral("trash:/") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+    urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 0);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 4);
-    QCOMPARE(args.at(2).toInt(), 4);
+    QCOMPARE(args.at(1).toInt(), 6);
+    QCOMPARE(args.at(2).toInt(), 6);
 
     fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign") << QStringLiteral("/media/XO-Y4")
+         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 4);
-    QCOMPARE(args.at(2).toInt(), 4);
+    QCOMPARE(args.at(1).toInt(), 6);
+    QCOMPARE(args.at(2).toInt(), 6);
     QCOMPARE(spy_removed.count(), 0);
 
     KBookmark seventh = root.first();
@@ -670,18 +693,19 @@
 
     urls.clear();
     urls << QDir::homePath() << QStringLiteral("remote:/") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/")
-         << QStringLiteral("/media/nfs") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom") << QStringLiteral("/foreign");
+         << QStringLiteral("/media/nfs") << QStringLiteral("/foreign")
+         << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
     CHECK_PLACES_URLS(urls);
     QCOMPARE(spy_inserted.count(), 1);
     args = spy_inserted.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 6);
-    QCOMPARE(args.at(2).toInt(), 6);
+    QCOMPARE(args.at(1).toInt(), 7);
+    QCOMPARE(args.at(2).toInt(), 7);
     QCOMPARE(spy_removed.count(), 1);
     args = spy_removed.takeFirst();
     QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
-    QCOMPARE(args.at(1).toInt(), 4);
-    QCOMPARE(args.at(2).toInt(), 4);
+    QCOMPARE(args.at(1).toInt(), 6);
+    QCOMPARE(args.at(2).toInt(), 6);
 }
 
 void KFilePlacesModelTest::testDeviceSetupTeardown()
@@ -693,15 +717,15 @@
 
     QCOMPARE(spy_changed.count(), 1);
     args = spy_changed.takeFirst();
-    QCOMPARE(args.at(0).toModelIndex().row(), 6);
-    QCOMPARE(args.at(1).toModelIndex().row(), 6);
+    QCOMPARE(args.at(0).toModelIndex().row(), 7);
+    QCOMPARE(args.at(1).toModelIndex().row(), 7);
 
     fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("setup"));
 
     QCOMPARE(spy_changed.count(), 1);
     args = spy_changed.takeFirst();
-    QCOMPARE(args.at(0).toModelIndex().row(), 6);
-    QCOMPARE(args.at(1).toModelIndex().row(), 6);
+    QCOMPARE(args.at(0).toModelIndex().row(), 7);
+    QCOMPARE(args.at(1).toModelIndex().row(), 7);
 }
 
 QTEST_MAIN(KFilePlacesModelTest)
diff --git a/src/filewidgets/kfileplacesitem.cpp b/src/filewidgets/kfileplacesitem.cpp
--- a/src/filewidgets/kfileplacesitem.cpp
+++ b/src/filewidgets/kfileplacesitem.cpp
@@ -44,8 +44,9 @@
                                  const QString &address,
                                  const QString &udi)
     : m_manager(manager), m_folderIsEmpty(true), m_isCdrom(false),
-      m_isAccessible(false), m_device(udi)
+      m_isAccessible(false)
 {
+    updateDeviceInfo(udi);
     setBookmark(m_manager->findByAddress(address));
 
     if (udi.isEmpty() && m_bookmark.metaDataItem(QStringLiteral("ID")).isEmpty()) {
@@ -56,18 +57,6 @@
             const KConfigGroup group = cfg.group("Status");
             m_folderIsEmpty = group.readEntry("Empty", true);
         }
-    } else if (!udi.isEmpty() && m_device.isValid()) {
-        m_access = m_device.as<Solid::StorageAccess>();
-        m_volume = m_device.as<Solid::StorageVolume>();
-        m_disc = m_device.as<Solid::OpticalDisc>();
-        m_mtp = m_device.as<Solid::PortableMediaPlayer>();
-        if (m_access) {
-            connect(m_access, SIGNAL(accessibilityChanged(bool,QString)),
-                    this, SLOT(onAccessibilityChanged(bool)));
-            onAccessibilityChanged(m_access->isAccessible());
-        }
-        m_iconPath = m_device.icon();
-        m_emblems = m_device.emblems();
     }
 }
 
@@ -98,6 +87,10 @@
 {
     m_bookmark = bookmark;
 
+    if (m_device.udi().isEmpty()) {
+        updateDeviceInfo(m_bookmark.metaDataItem(QStringLiteral("UDI")));
+    }
+
     if (bookmark.metaDataItem(QStringLiteral("isSystemItem")) == QLatin1String("true")) {
         // This context must stay as it is - the translated system bookmark names
         // are created with 'KFile System Bookmarks' as their context, so this
@@ -123,28 +116,17 @@
     case DevicesType:
         m_groupName = i18nc("@item", "Devices");
         break;
+    case RemovableDeviceType:
+        m_groupName = i18nc("@item", "Removable Devices");
+        break;
     default:
         Q_UNREACHABLE();
         break;
     }
 }
 
 Solid::Device KFilePlacesItem::device() const
 {
-    if (m_device.udi().isEmpty()) {
-        m_device = Solid::Device(bookmark().metaDataItem(QStringLiteral("UDI")));
-        if (m_device.isValid()) {
-            m_access = m_device.as<Solid::StorageAccess>();
-            m_volume = m_device.as<Solid::StorageVolume>();
-            m_disc = m_device.as<Solid::OpticalDisc>();
-            m_mtp = m_device.as<Solid::PortableMediaPlayer>();
-        } else {
-            m_access = nullptr;
-            m_volume = nullptr;
-            m_disc = nullptr;
-            m_mtp = nullptr;
-        }
-    }
     return m_device;
 }
 
@@ -181,7 +163,11 @@
         return PlacesType;
     }
 
-    return DevicesType;
+    if (m_drive && (m_drive->isHotpluggable() || m_drive->isRemovable())) {
+        return RemovableDeviceType;
+    } else {
+        return DevicesType;
+    }
 }
 
 QVariant KFilePlacesItem::bookmarkData(int role) const
@@ -251,14 +237,8 @@
             }
 
         case KFilePlacesModel::FixedDeviceRole: {
-            Solid::StorageDrive *drive = nullptr;
-            Solid::Device parentDevice = m_device;
-            while (parentDevice.isValid() && !drive) {
-                drive = parentDevice.as<Solid::StorageDrive>();
-                parentDevice = parentDevice.parent();
-            }
-            if (drive != nullptr) {
-                return !drive->isHotpluggable() && !drive->isRemovable();
+            if (m_drive != nullptr) {
+                return !m_drive->isHotpluggable() && !m_drive->isRemovable();
             }
             return true;
         }
@@ -344,6 +324,50 @@
 //         + '/' + QString::number(qrand());
 }
 
+bool KFilePlacesItem::updateDeviceInfo(const QString &udi)
+{
+    if (m_device.udi() == udi) {
+        return false;
+    }
+
+    if (m_access) {
+        m_access->disconnect(this);
+    }
+
+    m_device = Solid::Device(udi);
+    if (m_device.isValid()) {
+        m_access = m_device.as<Solid::StorageAccess>();
+        m_volume = m_device.as<Solid::StorageVolume>();
+        m_disc = m_device.as<Solid::OpticalDisc>();
+        m_mtp = m_device.as<Solid::PortableMediaPlayer>();
+        m_iconPath = m_device.icon();
+        m_emblems = m_device.emblems();
+
+        m_drive = nullptr;
+        Solid::Device parentDevice = m_device;
+        while (parentDevice.isValid() && !m_drive) {
+            m_drive = parentDevice.as<Solid::StorageDrive>();
+            parentDevice = parentDevice.parent();
+        }
+
+        if (m_access) {
+            connect(m_access, SIGNAL(accessibilityChanged(bool,QString)),
+                    this, SLOT(onAccessibilityChanged(bool)));
+            onAccessibilityChanged(m_access->isAccessible());
+        }
+    } else {
+        m_access = nullptr;
+        m_volume = nullptr;
+        m_disc = nullptr;
+        m_mtp = nullptr;
+        m_drive = nullptr;
+        m_iconPath.clear();
+        m_emblems.clear();
+    }
+
+    return true;
+}
+
 void KFilePlacesItem::onAccessibilityChanged(bool isAccessible)
 {
     m_isAccessible = isAccessible;
diff --git a/src/filewidgets/kfileplacesitem_p.h b/src/filewidgets/kfileplacesitem_p.h
--- a/src/filewidgets/kfileplacesitem_p.h
+++ b/src/filewidgets/kfileplacesitem_p.h
@@ -33,6 +33,7 @@
 {
 class StorageAccess;
 class StorageVolume;
+class StorageDrive;
 class OpticalDisc;
 class PortableMediaPlayer;
 }
@@ -46,7 +47,8 @@
         PlacesType,
         SearchForType,
         RecentlySavedType,
-        DevicesType
+        DevicesType,
+        RemovableDeviceType
     };
 
     KFilePlacesItem(KBookmarkManager *manager,
@@ -89,18 +91,20 @@
     QString iconNameForBookmark(const KBookmark &bookmark) const;
 
     static QString generateNewId();
+    bool updateDeviceInfo(const QString &udi);
 
     KBookmarkManager *m_manager;
     KBookmark m_bookmark;
     bool m_folderIsEmpty;
     bool m_isCdrom;
     bool m_isAccessible;
     QString m_text;
-    mutable Solid::Device m_device;
-    mutable QPointer<Solid::StorageAccess> m_access;
-    mutable QPointer<Solid::StorageVolume> m_volume;
-    mutable QPointer<Solid::OpticalDisc> m_disc;
-    mutable QPointer<Solid::PortableMediaPlayer> m_mtp;
+    Solid::Device m_device;
+    QPointer<Solid::StorageAccess> m_access;
+    QPointer<Solid::StorageVolume> m_volume;
+    QPointer<Solid::StorageDrive> m_drive;
+    QPointer<Solid::OpticalDisc> m_disc;
+    QPointer<Solid::PortableMediaPlayer> m_mtp;
     QString m_iconPath;
     QStringList m_emblems;
     QString m_groupName;