diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
index d6dc7d4180a..ffef13000d4 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
@@ -67,6 +67,11 @@ public class ContainerPropertyTab extends AbstractCBuildPropertyTab
 		@Override
 		public void modifyText(ModifyEvent e) {
 			int index = connectionSelector.getSelectionIndex();
+			if (index < 0) {
+				connection = null;
+				connectionName = "";
+				return;
+			}
 			if (connection != null)
 				connection.removeImageListener(containerTab);
 			connection = connections[index];