diff -r 296c7d34d2ba -r ac320de33ec7 cms/app-client/app/components/toolbar-component.js
--- a/cms/app-client/app/components/toolbar-component.js	Thu Aug 04 17:59:38 2016 +0200
+++ b/cms/app-client/app/components/toolbar-component.js	Fri Aug 05 14:55:45 2016 +0200
@@ -11,10 +11,8 @@
 		display: function(element) {
 			if(element === 'video') {
 				this.get('player').set('reduce', !this.get('player').get('reduce'));
-			} else if(this.get('player').get('window') !== element) {
-				this.get('player').set('window', element);
 			} else {
-				this.get('player').set('window', '');
+				this.get('player').display(element);
 			}
 		}