diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 83880df18..6105c5e84 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -200,8 +200,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
       collection_view_(new CollectionViewContainer(this)),
       file_view_(new FileView(this)),
 #ifndef Q_OS_WIN
-      device_view_container_(new DeviceViewContainer(this)),
-      device_view_(device_view_container_->view()),
+      device_view_(new DeviceViewContainer(this)),
 #endif
       playlist_list_(new PlaylistListContainer(this)),
       queue_view_(new QueueView(this)),
@@ -214,8 +213,6 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
         connect(cover_manager, SIGNAL(AddToPlaylist(QMimeData*)), this, SLOT(AddToPlaylist(QMimeData*)));
         return cover_manager;
       }),
-
-      //organise_dialog_(new OrganiseDialog(app_->task_manager())),
       equalizer_(new Equalizer),
       organise_dialog_([=]() {
         OrganiseDialog *dialog = new OrganiseDialog(app->task_manager(), app->collection_backend());
@@ -329,7 +326,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   collection_view_->view()->setModel(collection_sort_model_);
   collection_view_->view()->SetApplication(app_);
 #ifndef Q_OS_WIN
-  device_view_->SetApplication(app_);
+  device_view_->view()->SetApplication(app_);
 #endif
   playlist_list_->SetApplication(app_);
 
@@ -539,7 +536,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
 
 #ifndef Q_OS_WIN
   // Devices connections
-  connect(device_view_, SIGNAL(AddToPlaylistSignal(QMimeData*)), SLOT(AddToPlaylist(QMimeData*)));
+  connect(device_view_->view(), SIGNAL(AddToPlaylistSignal(QMimeData*)), SLOT(AddToPlaylist(QMimeData*)));
 #endif
 
   // Collection filter widget
diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index 5abd905a1..f2d2f4228 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -282,7 +282,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 #endif
 
   Application *app_;
-  SystemTrayIcon  *tray_icon_;
+  SystemTrayIcon *tray_icon_;
   OSD *osd_;
   Lazy<About> about_dialog_;
   Lazy<EditTagDialog> edit_tag_dialog_;
@@ -294,8 +294,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
   CollectionViewContainer *collection_view_;
   FileView *file_view_;
 #ifndef Q_OS_WIN
-  DeviceViewContainer *device_view_container_;
-  DeviceView *device_view_;
+  DeviceViewContainer *device_view_;
 #endif
   PlaylistListContainer *playlist_list_;
   QueueView *queue_view_;