diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 509300bb0..dd18cee43 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -2,16 +2,7 @@
   Neutrino-GUI  -   DBoxII-Project
 
   UPnP Browser (c) 2007 by Jochen Friedrich
-
-  Homepage: http://dbox.cyberphoria.org/
-
-  Kommentar:
-
-  Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
-  Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
-  auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
-  Steuerung getrennt. Diese wird dann von Daemons uebernommen.
-
+               (c) 2009-2011,2016 Stefan Seyfried
 
   License: GPL
 
@@ -436,6 +427,8 @@ std::vector<UPnPEntry> *CUpnpBrowserGui::decodeResult(std::string result)
 
 void CUpnpBrowserGui::updateDeviceSelection(int newpos)
 {
+	if (newpos < 0) /* do not explode if called with -1 arg... */
+		return;
 	if((int) m_selecteddevice != newpos) {
 		int prev_selected = m_selecteddevice;
 		unsigned int oldliststart = m_deviceliststart;
@@ -488,28 +481,10 @@ void CUpnpBrowserGui::selectDevice()
 		else if (msg_repeatok == (neutrino_msg_t) g_settings.key_list_end) {
 			updateDeviceSelection(m_devices.size()-1);
 		}
-		else if (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_pageup)
+		else if (msg_repeatok == CRCInput::RC_up || (int)msg == g_settings.key_pageup ||
+			 msg_repeatok == CRCInput::RC_down || (int)msg == g_settings.key_pagedown)
 		{
-			int step = ((int) msg == g_settings.key_pageup) ? m_listmaxshow : 1;  // browse or step 1
-			int new_selected = m_selecteddevice - step;
-			if (new_selected < 0) {
-				if (m_selecteddevice != 0 && step != 1)
-					new_selected = 0;
-				else
-					new_selected = m_devices.size() - 1;
-			}
-			updateDeviceSelection(new_selected);
-		}
-		else if (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)
-		{
-			int step =  ((int) msg == g_settings.key_pagedown) ? m_listmaxshow : 1;  // browse or step 1
-			int new_selected = m_selecteddevice + step;
-			if (new_selected > (int) m_devices.size() - 1) {
-				if ((m_selecteddevice != m_devices.size() - 1))
-					new_selected = m_devices.size() - 1;
-				else
-					new_selected = 0;
-			}
+			int new_selected = UpDownKey(m_devices, msg_repeatok, m_listmaxshow, m_selecteddevice);
 			updateDeviceSelection(new_selected);
 		}
 		else if (msg == CRCInput::RC_right || msg == CRCInput::RC_ok)
diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h
index 1e7f78051..940122d6a 100644
--- a/src/gui/upnpbrowser.h
+++ b/src/gui/upnpbrowser.h
@@ -37,6 +37,7 @@
 #include <driver/pictureviewer/pictureviewer.h>
 #include <gui/filebrowser.h>
 #include <gui/widget/menue.h>
+#include <gui/widget/listhelpers.h>
 
 #include <string>
 #include <sstream>
@@ -66,7 +67,7 @@ struct UPnPEntry
 	int		type;
 };
 
-class CUpnpBrowserGui : public CMenuTarget
+class CUpnpBrowserGui : public CMenuTarget, public CListHelpers
 {
 	public:
 	CUpnpBrowserGui();
diff --git a/src/gui/widget/listhelpers.cpp b/src/gui/widget/listhelpers.cpp
index c06c3504f..1249cc503 100644
--- a/src/gui/widget/listhelpers.cpp
+++ b/src/gui/widget/listhelpers.cpp
@@ -23,6 +23,7 @@
 
 #include <global.h>
 #include <gui/bouquetlist.h>
+#include <libupnpclient/upnpclient.h>
 
 static int upDownKey(int size, neutrino_msg_t msg, int lines, int sel)
 {
@@ -81,3 +82,4 @@ updown_t(std::vector<CBouquet*>);
 updown_t(std::vector<CZapitBouquet*>);
 updown_t(std::vector<CZapitChannel*>);
 updown_t(std::vector<CChannelEvent>);
+updown_t(std::vector<CUPnPDevice>);