diff --git a/css/style.scss b/css/style.scss
index 9819b3587..0469ebbb4 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -105,6 +105,7 @@ input.input-inline {
 		.colorselect {
 			div, label {
 				height: 32px;
+				width: auto;
 			}
 		}
 		form {
diff --git a/js/controller/ColorPickerController.js b/js/controller/ColorPickerController.js
index 3c91d0d19..fb4c5e119 100644
--- a/js/controller/ColorPickerController.js
+++ b/js/controller/ColorPickerController.js
@@ -20,6 +20,8 @@
  *
  */
 
+import app from '../app/App.js';
+
 /* global oc_defaults OC */
 app.controller('ColorPickerController', ['$scope', function($scope) {
     $scope.hashedColor = '';