diff --git a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
index 64b91e8f2b4ed5b0e07ef9a4dde0f28d2a911761..c5728b4c06fece30792e46ea4ef37aea1db362a3 100644
--- a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
+++ b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
@@ -71,7 +71,7 @@
</script>
</head>
<body>
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col-md-12" id ="dataset-uploader-form"></div>
</div>
diff --git a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
index d87061a8b0adbd18bc8394a838ee36bb1d612a31..2c0223b9fb4bc520239230a995118780e622bc62 100644
--- a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
+++ b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
@@ -68,7 +68,8 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$dataSetTypeFieldSet.append($dataSetTypeDropDown);
var owner = this._dataSetFormModel.sampleOrExperiment.identifier;
- $dataSetTypeFieldSet.append(FormUtil.getFieldForTextWithLabel(owner, "Sample"));
+ var ownerLabel = (owner.split("/").length === 3)?"Sample":"Experiment";
+ $dataSetTypeFieldSet.append(FormUtil.getFieldForTextWithLabel(owner, ownerLabel));
//
// Registration and modification info