diff --git a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
index c077daae59538037752971c31b0ba7a13b8e69f7..fd4f46b9c7533864692e5a875eaa13d9284a6df4 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
@@ -462,12 +462,13 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
 			} else if(event instanceof SelectionEvent) {
 				SelectionEvent se = (SelectionEvent)event;
 				String cmd = se.getCommand();
-				PortfolioElementRow row = model.getObject(se.getIndex());
 				if("up".equals(cmd)) {
+					PortfolioElementRow row = model.getObject(se.getIndex());
 					if(row.isPendingAssignment()) {
 						doMoveUpAssignment(row);
 					}
 				} else if("down".equals(cmd)) {
+					PortfolioElementRow row = model.getObject(se.getIndex());
 					if(row.isPendingAssignment()) {
 						doMoveDownAssignment(row);
 					}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java b/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
index 5fb5877c62fe6f23358a3f17ae6c62538fa97baa..51fc7526ad5725b3e2e9062809b0b46ac204c62f 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
@@ -449,7 +449,11 @@ public class MediaCenterController extends FormBasicController
 						List<MediaRow> rows = model.getObjects();
 						for(MediaRow row:rows) {
 							if(row != null && row.getKey().equals(rowKey)) {
-								doOpenMedia(ureq, rowKey);
+								if(select) {
+									doSelect(ureq, rowKey);
+								} else {
+									doOpenMedia(ureq, rowKey);
+								}
 							}
 						}
 					} catch (NumberFormatException e) {
diff --git a/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java b/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
index c31ddd65fa3ddc6ecfb1aff3a054b9dda37d7909..79b58fd10fa40a379bc4c3a82314ae43721960d1 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.Date;
 
 import org.olat.core.gui.components.form.flexible.elements.FormLink;
+import org.olat.core.util.StringHelper;
 import org.olat.course.assessment.AssessmentHelper;
 import org.olat.modules.portfolio.AssessmentSection;
 import org.olat.modules.portfolio.Assignment;
@@ -292,9 +293,11 @@ public class PortfolioElementRow {
 		this.commentFormLink = commentFormLink;
 	}
 
-
 	public String[] getMetaBinderAndSectionTitles() {
-		return new String[]{ metaBinderTitle, metaSectionTitle };
+		if(StringHelper.containsNonWhitespace(metaBinderTitle) && StringHelper.containsNonWhitespace(metaSectionTitle)) {
+			return new String[]{ metaBinderTitle, metaSectionTitle };
+		}
+		return null;
 	}
 
 	public void setMetaSectionTitle(String metaSectionTitle) {