diff --git a/src/internet/googledriveservice.cpp b/src/internet/googledriveservice.cpp
index a6111988c..4c4086b60 100644
--- a/src/internet/googledriveservice.cpp
+++ b/src/internet/googledriveservice.cpp
@@ -65,7 +65,9 @@ QStandardItem* GoogleDriveService::CreateRootItem() {
 void GoogleDriveService::LazyPopulate(QStandardItem* item) {
   switch (item->data(InternetModel::Role_Type).toInt()) {
     case InternetModel::Type_Service:
-      Connect();
+      if (!client_->is_authenticated()) {
+        Connect();
+      }
       library_model_->Init();
       model()->merged_model()->AddSubModel(item->index(), library_sort_model_);
       break;
@@ -110,6 +112,17 @@ void GoogleDriveService::ConnectFinished(google_drive::ConnectResponse* response
   ListFilesForMimeType("application/x-flac");  // FLAC
 }
 
+void GoogleDriveService::EnsureConnected() {
+  if (client_->is_authenticated()) {
+    return;
+  }
+
+  QEventLoop loop;
+  connect(client_, SIGNAL(Authenticated()), &loop, SLOT(quit()));
+  Connect();
+  loop.exec();
+}
+
 void GoogleDriveService::FilesFound(const QList<google_drive::File>& files) {
   foreach (const google_drive::File& file, files) {
     MaybeAddFileToDatabase(file);
@@ -183,6 +196,7 @@ void GoogleDriveService::ReadTagsFinished(TagReaderClient::ReplyType* reply,
 }
 
 QUrl GoogleDriveService::GetStreamingUrlFromSongId(const QString& id) {
+  EnsureConnected();
   QScopedPointer<google_drive::GetFileResponse> response(client_->GetFile(id));
 
   QEventLoop loop;
diff --git a/src/internet/googledriveservice.h b/src/internet/googledriveservice.h
index a253e3fd8..22fa562b0 100644
--- a/src/internet/googledriveservice.h
+++ b/src/internet/googledriveservice.h
@@ -46,6 +46,7 @@ class GoogleDriveService : public InternetService {
 
  private:
   void Connect();
+  void EnsureConnected();
   void RefreshAuthorisation(const QString& refresh_token);
   void MaybeAddFileToDatabase(const google_drive::File& file);
   void ListFilesForMimeType(const QString& mime_type);