diff --git a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
index d10e44c8b3..7ed2531770 100755
--- a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
+++ b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
@@ -286,6 +286,7 @@ public void widgetDisposed(DisposeEvent e) {
         			arrowCursor.dispose();
         		}
         	});
+            fStopButton.setEnabled(false);
 			fStopButton.setToolTipText(JFaceResources.getString("ProgressMonitorPart.cancelToolTip")); //$NON-NLS-1$
         }
     }
diff --git a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardDialog.java b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardDialog.java
index c9d1fa7d1c..f349313aeb 100755
--- a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardDialog.java
+++ b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardDialog.java
@@ -1333,10 +1333,11 @@ public void updateButtons() {
 		boolean canFlipToNextPage = false;
 		boolean canFinish = wizard.canFinish();
 		if (backButton != null) {
-			backButton.setEnabled(currentPage.getPreviousPage() != null);
+			boolean backEnabled = currentPage != null && currentPage.getPreviousPage() != null;
+			backButton.setEnabled(backEnabled);
 		}
 		if (nextButton != null) {
-			canFlipToNextPage = currentPage.canFlipToNextPage();
+			canFlipToNextPage = currentPage != null && currentPage.canFlipToNextPage();
 			nextButton.setEnabled(canFlipToNextPage);
 		}
 		finishButton.setEnabled(canFinish);
diff --git a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardSelectionPage.java b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardSelectionPage.java
index 2fdfd9ed90..7e10a9841e 100755
--- a/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardSelectionPage.java
+++ b/bundles/org.eclipse.rap.jface/src/org/eclipse/jface/wizard/WizardSelectionPage.java
@@ -109,6 +109,8 @@ public IWizardPage getNextPage() {
         }
 
         if (!isCreated) {
+            // Allow the wizard to know its surrounding container
+            wizard.setContainer(getContainer());
 			// Allow the wizard to create its pages
             wizard.addPages();
 		}
diff --git a/bundles/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java b/bundles/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java
index b71bd2e168..127d07dcbf 100755
--- a/bundles/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java	
+++ b/bundles/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java	
@@ -54,7 +54,7 @@
  * particular job in a modal dialog so as to give a user accustomed to a modal
  * UI a more familiar feel.
  */
-class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog {
+public class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog {
 	Job job;
 	private boolean showDialog;