diff --git a/platformcode/autorenumber.py b/platformcode/autorenumber.py
index 66883346..588c37b5 100644
--- a/platformcode/autorenumber.py
+++ b/platformcode/autorenumber.py
@@ -90,6 +90,7 @@ def busy(state):
 
 # Main
 def start(itemlist, item=None):
+    if not itemlist: return
     if type(itemlist) == Item:
         item = itemlist
         if item.channel in ['autorenumber']:
diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 75eaf0e4..b11dd11a 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -749,6 +749,7 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
             while not xbmc.Player().getTime() > 0:
                 xbmc.sleep(500)
             self.close()
+            xbmc.sleep(500)
             while xbmcgui.getCurrentWindowId() in [12005, 12006]:
                 xbmc.sleep(500)
             if platformtools.is_playing():