diff --git a/distro/changelog.xml b/distro/changelog.xml
index 70404ec..88fe2d6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -3,6 +3,8 @@
 		date="2013-05-29">
 		<Change>Added support for fine grained notifications settings
 		</Change>
+		<Change>Added support for workspace notifications direct opening
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlet.user.notifications.0-2-0"
 		date="2013-04-19">
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java
index 0a406f8..101caeb 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java
@@ -41,7 +41,7 @@ import com.google.gwt.user.client.ui.Widget;
  * @author Massimiliano Assante ISTI-CNR
  *
  */
-public class NotificationSettingsDialog extends GCubeDialog {
+public class NotificationSettingsDialog extends GCubeDialog { 
 
 	private VerticalPanel mainPanel = new VerticalPanel();
 	private VerticalPanel container = new VerticalPanel();
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
index 4a5693d..6ef489d 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
@@ -94,6 +94,16 @@ public class SingleNotificationView extends Composite {
 		case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
 			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
 			break;
+		case WP_FOLDER_SHARE:
+		case WP_FOLDER_ADDEDUSER:
+		case WP_FOLDER_REMOVEDUSER:
+		case WP_FOLDER_RENAMED:
+		case WP_ITEM_DELETE:
+		case WP_ITEM_NEW:
+		case WP_ITEM_RENAMED:
+		case WP_ITEM_UPDATED:
+			goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> Go to Folder.</a>");
+			break;
 		}
 	}
 
diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index b33576e..6f5a010 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -123,7 +123,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
 	public HashMap<Date, ArrayList<Notification>> getUserNotifications() {
 		HashMap<Date, ArrayList<Notification>> toReturn = new HashMap<Date, ArrayList<Notification>>();
 		try {
-			for (Notification notification : store.getAllNotificationByUser(getASLSession().getUsername(), 20)) {
+			for (Notification notification : store.getAllNotificationByUser(getASLSession().getUsername(), 30)) {
 				Date dateWithoutTime = removeTimePart(notification.getTime());
 				if (! toReturn.containsKey(dateWithoutTime)) {
 					ArrayList<Notification> nots = new ArrayList<Notification>();