2 files changed, 4 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java
index 7034757d4c5..a250e751f99 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java
@@ -119,7 +119,8 @@ public class EnvDialog extends Dialog {
 
 			text1.setText(var.getName());
 			text1.setEnabled(false); // don't change name
-			text2.setText(var.getValue()); 
+			String s = var.getValue();
+			text2.setText(s == null ? AbstractCPropertyTab.EMPTY_STR : s); 
 		}
 		
 		gd.horizontalSpan = 3;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java
index 7ab157eec0e..549a41c6fa4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java
@@ -256,6 +256,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 					vars.createVariable(dlg.t1.trim(), dlg.t2.trim(),
 						IEnvironmentVariable.ENVVAR_REPLACE, var.getDelimiter());
 				updateData();
+				table.setSelection(n);
 			}
 			break;
 		case 3: // remove
@@ -289,6 +290,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 						var.getDelimiter(), cfgd);
 			}
 			updateData();
+			table.setSelection(n);
 			break;
 		}
 		updateButtons();