diff --git a/app/src/main/java/com/winlator/ContainerDetailFragment.java b/app/src/main/java/com/winlator/ContainerDetailFragment.java
index 671c4a8..61e85f7 100644
--- a/app/src/main/java/com/winlator/ContainerDetailFragment.java
+++ b/app/src/main/java/com/winlator/ContainerDetailFragment.java
@@ -387,7 +387,7 @@ public class ContainerDetailFragment extends Fragment {
         for (int i = 0; i < parent.getChildCount(); i++) {
             View child = parent.getChildAt(i);
             String name = ((TextView)child.findViewById(R.id.TextView)).getText().toString();
-            String value = ((EditText)child.findViewById(R.id.EditText)).getText().toString().trim();
+            String value = ((EditText)child.findViewById(R.id.EditText)).getText().toString().trim().replace(" ", "");
             if (!value.isEmpty()) envVars.put(name, value);
         }
         return envVars.toString();
diff --git a/app/src/main/java/com/winlator/contentdialog/AddEnvVarDialog.java b/app/src/main/java/com/winlator/contentdialog/AddEnvVarDialog.java
index 3b69d53..2704e2b 100644
--- a/app/src/main/java/com/winlator/contentdialog/AddEnvVarDialog.java
+++ b/app/src/main/java/com/winlator/contentdialog/AddEnvVarDialog.java
@@ -21,8 +21,8 @@ public class AddEnvVarDialog extends ContentDialog {
         setIcon(R.drawable.icon_env_var);
 
         setOnConfirmCallback(() -> {
-            String name = etName.getText().toString().trim();
-            String value = etValue.getText().toString().trim();
+            String name = etName.getText().toString().trim().replace(" ", "");
+            String value = etValue.getText().toString().trim().replace(" ", "");
 
             if (!name.isEmpty() && !value.isEmpty()) {
                 LinearLayout parent = container.findViewById(R.id.LLEnvVars);