diff --git a/resources/lib/servers_manager.py b/resources/lib/servers_manager.py
index 887c532..570b158 100644
--- a/resources/lib/servers_manager.py
+++ b/resources/lib/servers_manager.py
@@ -163,6 +163,8 @@ def modifyServer():
     if i == False:
         return
     while True:
+        if xbmc.Monitor().abortRequested():
+            return
         key = showServerData(serverData["servers"][i])
         if key == False:
             break