diff --git a/usr/lib/webapp-manager/common.py b/usr/lib/webapp-manager/common.py
index 7c46d45..a3fcb09 100644
--- a/usr/lib/webapp-manager/common.py
+++ b/usr/lib/webapp-manager/common.py
@@ -156,9 +156,9 @@ def __init__(self):
     def get_webapps(self):
         webapps = []
         for filename in os.listdir(APPS_DIR):
-            if filename.startswith("webapp-") and filename.endswith(".desktop"):
+            if filename.lower().startswith("webapp-") and filename.endswith(".desktop"):
                 path = os.path.join(APPS_DIR, filename)
-                codename = filename.replace("webapp-", "").replace(".desktop", "")
+                codename = filename.replace("webapp-", "").replace("WebApp-", "").replace(".desktop", "")
                 if not os.path.isdir(path):
                     try:
                         webapp = WebAppLauncher(path, codename)
@@ -248,7 +248,7 @@ def create_webapp(self, name, url, icon, category, browser, custom_parameters, i
         # Generate a 4 digit random code (to prevent name collisions, so we can define multiple launchers with the same name)
         random_code =  ''.join(choice(string.digits) for _ in range(4))
         codename = "".join(filter(str.isalpha, name)) + random_code
-        path = os.path.join(APPS_DIR, "webapp-%s.desktop" % codename)
+        path = os.path.join(APPS_DIR, "WebApp-%s.desktop" % codename)
 
         with open(path, 'w') as desktop_file:
             desktop_file.write("[Desktop Entry]\n")