diff --git a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.css b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.css
index 86285862..2b529fb7 100644
--- a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.css
+++ b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.css
@@ -80,7 +80,7 @@ size and position, etc.
   border-bottom-left-radius: var(--borderRadius);
   border-bottom-right-radius: var(--borderRadius);
   box-shadow: var(--boxShadowPopup);
-  z-index: var(--zIndexPopup + 1);
+  z-index: calc(var(--zIndexPopup) + 1);
 }
 
 /*
diff --git a/src/forms/EditListingLocationForm/EditListingLocationForm.css b/src/forms/EditListingLocationForm/EditListingLocationForm.css
index 89eb7247..6d5f00b4 100644
--- a/src/forms/EditListingLocationForm/EditListingLocationForm.css
+++ b/src/forms/EditListingLocationForm/EditListingLocationForm.css
@@ -57,7 +57,7 @@
   border-bottom-left-radius: var(--borderRadius);
   border-bottom-right-radius: var(--borderRadius);
   box-shadow: var(--boxShadowPopup);
-  z-index: var(--zIndexPopup + 1);
+  z-index: calc(var(--zIndexPopup) + 1);
 
   @media (--viewportMedium) {
     top: 40px;
diff --git a/src/forms/LocationSearchForm/LocationSearchForm.css b/src/forms/LocationSearchForm/LocationSearchForm.css
index cc87d163..46fbfffd 100644
--- a/src/forms/LocationSearchForm/LocationSearchForm.css
+++ b/src/forms/LocationSearchForm/LocationSearchForm.css
@@ -58,7 +58,7 @@
   border-bottom-left-radius: var(--borderRadius);
   border-bottom-right-radius: var(--borderRadius);
   box-shadow: var(--boxShadowPopup);
-  z-index: var(--zIndexPopup + 1);
+  z-index: calc(var(--zIndexPopup) + 1);
 
   margin-top: 16px;
   margin-bottom: 102px;
diff --git a/src/forms/TopbarSearchForm/TopbarSearchForm.css b/src/forms/TopbarSearchForm/TopbarSearchForm.css
index 25aac5fc..b08b382b 100644
--- a/src/forms/TopbarSearchForm/TopbarSearchForm.css
+++ b/src/forms/TopbarSearchForm/TopbarSearchForm.css
@@ -137,7 +137,7 @@
   border-bottom-left-radius: var(--borderRadius);
   border-bottom-right-radius: var(--borderRadius);
   box-shadow: var(--boxShadowPopup);
-  z-index: var(--zIndexPopup + 1);
+  z-index: calc(var(--zIndexPopup) + 1);
 }
 
 .mobilePredictionsAttribution {
@@ -157,7 +157,7 @@
   border-bottom-left-radius: var(--borderRadius);
   border-bottom-right-radius: var(--borderRadius);
   box-shadow: var(--boxShadowPopup);
-  z-index: var(--zIndexPopup + 1);
+  z-index: calc(var(--zIndexPopup) + 1);
 
   margin-top: calc(
     var(--topbarHeightDesktop) - var(--TopbarSearchForm_inputHeight) +