diff --git a/src/css/spectrum/spectrum-overrides.css b/src/css/spectrum/spectrum-overrides.css
index 15de5ceb..0b9f2431 100644
--- a/src/css/spectrum/spectrum-overrides.css
+++ b/src/css/spectrum/spectrum-overrides.css
@@ -70,6 +70,12 @@
   border-right-width: 0;
 }
 
+.sp-picker-container {
+  padding: 5px;
+  padding-bottom: 300px;
+  margin-bottom: -295px;
+}
+
 .sp-slider {
   height: 5px;
   left: -2px;
diff --git a/src/js/Constants.js b/src/js/Constants.js
index d3af0d98..851c9405 100644
--- a/src/js/Constants.js
+++ b/src/js/Constants.js
@@ -18,6 +18,9 @@ var Constants = {
   DEFAULT_PEN_COLOR : '#000000',
   TRANSPARENT_COLOR : 'rgba(0, 0, 0, 0)',
 
+  // Used for Spectrum input
+  PREFERRED_COLOR_FORMAT : 'rgb',
+
   /*
    * Fake semi-transparent color used to highlight transparent
    * strokes and rectangles:
diff --git a/src/js/lib/spectrum/spectrum.js b/src/js/lib/spectrum/spectrum.js
index c2ee8385..731b0ce1 100644
--- a/src/js/lib/spectrum/spectrum.js
+++ b/src/js/lib/spectrum/spectrum.js
@@ -670,7 +670,7 @@
 
             // Update the text entry input as it changes happen
             if (opts.showInput) {
-                textInput.val(realColor.toString(format));
+                textInput.val(realColor.toString(Constants.PREFERRED_COLOR_FORMAT || format));
             }
 
             if (opts.showPalette) {