diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index f46befcd..1bd103b7 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -86,9 +86,9 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 
 	labelMedia: function(button, event, record) {
 	    let me = this;
-
 	    Ext.create('PBS.TapeManagement.LabelMediaWindow', {
 		driveid: record.data.name,
+		label: record.data["label-text"],
 	    }).show();
 	},
 
@@ -421,6 +421,9 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 		me.lookup('drives').getStore().rstore.setData(data.drive);
 		me.lookup('drives').getStore().rstore.fireEvent('load', me, [], true);
 
+		// manually fire selectionchange to update button status
+		me.lookup('drives').getSelectionModel().fireEvent('selectionchange', me);
+
 		if (!use_cache) {
 		    Proxmox.Utils.setErrorMask(view);
 		}
@@ -631,6 +634,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    handler: 'labelMedia',
 				    iconCls: 'fa fa-barcode',
 				    disabled: true,
+				    enableFn: (rec) => rec.data["label-text"] !== undefined,
 				},
 				{
 				    text: gettext('Catalog'),
@@ -638,6 +642,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    handler: 'catalog',
 				    iconCls: 'fa fa-book',
 				    disabled: true,
+				    enableFn: (rec) => rec.data["label-text"] !== undefined,
 				},
 				{
 				    text: gettext('Clean Drive'),
diff --git a/www/tape/window/LabelMedia.js b/www/tape/window/LabelMedia.js
index e18b08c4..21f20dba 100644
--- a/www/tape/window/LabelMedia.js
+++ b/www/tape/window/LabelMedia.js
@@ -14,6 +14,7 @@ Ext.define('PBS.TapeManagement.LabelMediaWindow', {
 	let me = this;
 	return {
 	    driveid: config.driveid,
+	    label: config.label,
 	};
     },
 
@@ -51,6 +52,9 @@ Ext.define('PBS.TapeManagement.LabelMediaWindow', {
 	    name: 'label-text',
 	    xtype: 'proxmoxtextfield',
 	    allowBlank: false,
+	    cbind: {
+		value: '{label}',
+	    },
 	},
 	{
 	    xtype: 'pbsMediaPoolSelector',