diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
index d799efa..9af0288 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
@@ -225,6 +225,36 @@ public class CreateDatasetForm extends Composite{
 
 	}
 
+	/**
+	 * Bind on events
+	 */
+	private void bind() {
+
+		// when a custom field is removed, remove it from the list
+		eventBus.addHandler(DeleteCustomFieldEvent.TYPE, new DeleteCustomFieldEventHandler() {
+
+			@Override
+			public void onRemoveEntry(DeleteCustomFieldEvent event) {
+
+				customFieldEntriesList.remove(event.getRemovedEntry());
+				customFields.remove(event.getRemovedEntry());
+
+			}
+		});
+
+		// on close form
+		eventBus.addHandler(CloseCreationFormEvent.TYPE, new CloseCreationFormEventHandler() {
+
+			@Override
+			public void onClose(CloseCreationFormEvent event) {
+
+				closeDialogBox();
+
+			}
+
+		});
+
+	}
 
 	/**
 	 * The real constructor
@@ -559,37 +589,6 @@ public class CreateDatasetForm extends Composite{
 		}
 	}
 
-	/**
-	 * Bind on events
-	 */
-	private void bind() {
-
-		// when a custom field is removed, remove it from the list
-		eventBus.addHandler(DeleteCustomFieldEvent.TYPE, new DeleteCustomFieldEventHandler() {
-
-			@Override
-			public void onRemoveEntry(DeleteCustomFieldEvent event) {
-
-				customFieldEntriesList.remove(event.getRemovedEntry());
-				customFields.remove(event.getRemovedEntry());
-
-			}
-		});
-
-		// on close form
-		eventBus.addHandler(CloseCreationFormEvent.TYPE, new CloseCreationFormEventHandler() {
-
-			@Override
-			public void onClose(CloseCreationFormEvent event) {
-
-				closeDialogBox();
-
-			}
-
-		});
-
-	}
-
 	@UiHandler("addCustomFieldButton")
 	void addCustomFieldEvent(ClickEvent e){
 
@@ -611,8 +610,9 @@ public class CreateDatasetForm extends Composite{
 
 				// we need to show the page to handle resources one by one from the workspace
 				formFirstStep.setVisible(false);
-				formSecondStep.setVisible(true);
-				formThirdStep.setVisible(false);
+				boolean resourcesPresent = receivedBean.getResources() != null && receivedBean.getResources().size() > 0 ? true : false;
+				formSecondStep.setVisible(resourcesPresent);
+				formThirdStep.setVisible(!resourcesPresent);
 
 				// add the resources to the container panel
 				if(workspaceResourcesContainer.getWidget() == null)
@@ -654,8 +654,9 @@ public class CreateDatasetForm extends Composite{
 
 		// swap forms
 		if(isWorkspaceRequest){
-			formFirstStep.setVisible(false);
-			formSecondStep.setVisible(true);
+			boolean resourcesPresent = receivedBean.getResources() != null && receivedBean.getResources().size() > 0 ? true : false;
+			formFirstStep.setVisible(!resourcesPresent);
+			formSecondStep.setVisible(resourcesPresent);
 		}else{
 			formFirstStep.setVisible(true);
 			formSecondStep.setVisible(false);
@@ -966,7 +967,7 @@ public class CreateDatasetForm extends Composite{
 	private String areProfileDataValid() {
 
 		for (MetaDataFieldSkeleton field : listOfMetadataFields) {
-			
+
 			field.removeError();
 
 			String error = field.isFieldValueValid();
@@ -1040,7 +1041,7 @@ public class CreateDatasetForm extends Composite{
 	private String validateDataOnContinue() {
 
 		String errorMessage = null;
-		
+
 		// remove errors
 		productTitleGroup.setType(ControlGroupType.NONE);
 		maintainerControlGroup.setType(ControlGroupType.NONE);