diff --git a/frontend/src/components/LinkWithSearchParams.tsx b/frontend/src/components/LinkWithSearchParams.tsx
index 5d58049..ed7d280 100644
--- a/frontend/src/components/LinkWithSearchParams.tsx
+++ b/frontend/src/components/LinkWithSearchParams.tsx
@@ -24,7 +24,7 @@ const LinkWithSearchParams = ({
   let prefixedUrl = to;
 
   if (!clusterMode) {
-    prefixedUrl = `/${context}${to}`;
+    prefixedUrl = `/${encodeURIComponent(context)}${to}`;
   }
 
   return (
diff --git a/frontend/src/components/modal/InstallChartModal/InstallUpgradeTitle.tsx b/frontend/src/components/modal/InstallChartModal/InstallUpgradeTitle.tsx
index 397d6ab..0f169c3 100644
--- a/frontend/src/components/modal/InstallChartModal/InstallUpgradeTitle.tsx
+++ b/frontend/src/components/modal/InstallChartModal/InstallUpgradeTitle.tsx
@@ -17,7 +17,7 @@ export const InstallUpgradeTitle: FC<InstallUpgradeProps> = ({
     <div className="font-bold">
       {`${text}`}
       {(isUpgrade || releaseValues) && (
-        <span className="text-green-700">{chartName}</span>
+        <span className="text-green-700 ml-1">{chartName}</span>
       )}
     </div>
   );