diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsole.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsole.java
index e21fed3260f..0044a83a1b9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsole.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsole.java
@@ -65,7 +65,7 @@ public class GdbFullCliConsole extends AbstractConsole implements IGDBDebuggerCo
     			PlatformUI.getWorkbench().getDisplay().asyncExec(() -> setName(newName));
     		} catch (SWTException e) {
     			// display may be disposed, so ignore the exception
-    			if (e.code != SWT.ERROR_WIDGET_DISPOSED) {
+    			if (e.code != SWT.ERROR_WIDGET_DISPOSED && e.code != SWT.ERROR_DEVICE_DISPOSED) {
     				throw e;
     			}
     		}