diff --git a/backend/tabby/settings.py b/backend/tabby/settings.py
index 96a30ce..2e0505c 100644
--- a/backend/tabby/settings.py
+++ b/backend/tabby/settings.py
@@ -222,7 +222,7 @@ STATIC_ROOT = BASE_DIR / 'public'
 
 
 if FRONTEND_URL:
-    CORS_ALLOWED_ORIGINS = [FRONTEND_URL]
+    CORS_ALLOWED_ORIGINS = [FRONTEND_URL, 'https://tabby.sh']
     CORS_ALLOW_CREDENTIALS = True
     CORS_ALLOW_HEADERS = [
         'accept',
diff --git a/.eslintrc.yml b/frontend/.eslintrc.yml
similarity index 100%
rename from .eslintrc.yml
rename to frontend/.eslintrc.yml