diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
index 6626ff73cd..deed64736f 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyListItem.jsx
@@ -98,7 +98,11 @@ function SurveyListItem({
           dataListCells={[
             <DataListCell key="name">
               <>
-                <Link to={`survey/edit?question_variable=${question.variable}`}>
+                <Link
+                  to={`survey/edit?question_variable=${encodeURIComponent(
+                    question.variable
+                  )}`}
+                >
                   {question.question_name}
                 </Link>
                 {question.required && (
diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionEdit.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionEdit.jsx
index 16e0df584d..aec9564d23 100644
--- a/awx/ui_next/src/screens/Template/Survey/SurveyQuestionEdit.jsx
+++ b/awx/ui_next/src/screens/Template/Survey/SurveyQuestionEdit.jsx
@@ -15,7 +15,9 @@ export default function SurveyQuestionEdit({ survey, updateSurvey }) {
   const match = useRouteMatch();
   const { search } = useLocation();
   const queryParams = new URLSearchParams(search);
-  const questionVariable = queryParams.get('question_variable');
+  const questionVariable = decodeURIComponent(
+    queryParams.get('question_variable')
+  );
 
   if (!survey) {
     return <ContentLoading />;