diff --git a/src/radio/radiomodel.h b/src/radio/radiomodel.h
index 180b7802c..d9be1455d 100644
--- a/src/radio/radiomodel.h
+++ b/src/radio/radiomodel.h
@@ -44,6 +44,14 @@ class RadioModel : public SimpleTreeModel<RadioItem> {
   // Needs to be static for RadioPlaylistItem::restore
   static RadioService* ServiceByName(const QString& name);
 
+  template<typename T>
+  static T* Service() {
+    if (sServices.contains(T::kServiceName)) {
+      return static_cast<T*>(sServices[T::kServiceName]);
+    }
+    return NULL;
+  }
+
   // This is special because Player needs it for scrobbling
   LastFMService* GetLastFMService() const;
 
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 9e58bc6f8..555565a70 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -327,11 +327,10 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   LastFMButtonVisibilityChanged(radio_model_->GetLastFMService()->AreButtonsVisible());
 
   // Connections to the saved streams service
-  SavedRadio* saved_radio_ = qobject_cast<SavedRadio*>(
-      RadioModel::ServiceByName(SavedRadio::kServiceName));
-  add_stream_dialog_->set_add_on_accept(saved_radio_);
+  SavedRadio* saved_radio = RadioModel::Service<SavedRadio>();
+  add_stream_dialog_->set_add_on_accept(saved_radio);
 
-  connect(saved_radio_, SIGNAL(ShowAddStreamDialog()),
+  connect(saved_radio, SIGNAL(ShowAddStreamDialog()),
           add_stream_dialog_.get(), SLOT(show()));
 
   // Tray icon