diff --git a/resources/lib/helper/playutils.py b/resources/lib/helper/playutils.py
index 364026d7..5564adaa 100644
--- a/resources/lib/helper/playutils.py
+++ b/resources/lib/helper/playutils.py
@@ -9,12 +9,11 @@ from uuid import uuid4
 
 import xbmc
 import xbmcvfs
-import xbmcgui
 
 import api
 import database
 import client
-from . import _, settings, window
+from . import _, settings, window, dialog
 from libraries import requests
 from downloader import TheVoid
 from emby import Emby
@@ -111,7 +110,7 @@ class PlayUtils(object):
             for source in sources:
                 selection.append(source.get('Name', "na"))
 
-            resp = xbmcgui.Dialog().select(_(33130), selection)
+            resp = dialog("select", _(33130), selection)
             if resp > -1:
                 source = sources[resp]
             else:
diff --git a/resources/settings.xml b/resources/settings.xml
index aaa810ce..6d60086d 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -85,8 +85,8 @@
 		<setting label="30004" id="logLevel" type="enum" values="Disabled|Info|Debug" default="1" />
 		<setting label="30529" id="startupDelay" type="number" default="0" option="int" />
 		<setting label="30239" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=reset)" option="close" />
-		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" />
-		<setting label="24034" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=checkupdate)" />
+		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" option="close" />
+		<setting label="24034" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=checkupdate)" option="close" />
 		
 		<setting type="sep"/>
 		<setting label="33104" type="lsep"/>