diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index 8a38038ede0..034b5eadabd 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java	
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java	
@@ -2553,7 +2553,11 @@ public boolean restart() {
 
 	@Override
 	public boolean restart(boolean useCurrrentWorkspace) {
-		if (useCurrrentWorkspace) {
+		if (Platform.inDevelopmentMode()) {
+			// In development mode, command line parameters cannot be changed and restart
+			// will always be EXIT_RESTART. Also see setRestartArguments method
+			System.setProperty(PROP_EXIT_CODE, IApplication.EXIT_RESTART.toString());
+		} else if (useCurrrentWorkspace) {
 			URL instanceUrl = Platform.getInstanceLocation().getURL();
 			if (instanceUrl != null) {
 				try {