diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 08d786fb8..586305a57 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -70,7 +70,15 @@ CUpnpBrowserGui::CUpnpBrowserGui()
 	m_socket = new CUPnPSocket();
 	m_frameBuffer = CFrameBuffer::getInstance();
 	m_playing_entry_is_shown = false;
-	
+
+	initModules();
+
+	dline = NULL;
+	image = NULL;
+}
+
+void CUpnpBrowserGui::initModules()
+{
 	topbox.enableFrame(true, 2);
 	topbox.setCorner(RADIUS_LARGE);
 	topbox.setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_MENUCONTENTDARK_PLUS_0, COL_MENUHEAD_TEXT);
@@ -88,9 +96,6 @@ CUpnpBrowserGui::CUpnpBrowserGui()
 	timebox.setColorAll(ibox.getColorFrame(), ibox.getColorBody());
 	timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]);
 	timebox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_INFOBAR_SHADOW_PLUS_1, g_settings.theme.menu_Hint_gradient_direction);
-
-	dline = NULL;
-	image = NULL;
 }
 
 CUpnpBrowserGui::~CUpnpBrowserGui()
diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h
index 02e2ea08d..4df99a780 100644
--- a/src/gui/upnpbrowser.h
+++ b/src/gui/upnpbrowser.h
@@ -101,7 +101,7 @@ class CUpnpBrowserGui : public CMenuTarget, public CListHelpers
 	void splitProtocol(std::string &protocol, std::string &prot, std::string &network, std::string &mime, std::string &additional);
 	bool getResults(std::string id, unsigned int start, unsigned int count, std::list<UPnPAttribute> &results); 
 	std::vector<UPnPEntry> *decodeResult(std::string);
-
+	void initModules();
 	void updateDeviceSelection(int newpos);
 	void selectDevice();
 	void paintDevices();