diff --git a/lib/picker.date.js b/lib/picker.date.js
index b34e8739..a81f2308 100644
--- a/lib/picker.date.js
+++ b/lib/picker.date.js
@@ -118,18 +118,18 @@ function DatePicker( picker, settings ) {
     // Bind some picker events.
     picker.
         on( 'render', function() {
-            picker.$root.find( '.' + settings.klass.selectMonth ).on( 'change', function() {
+            picker.$root.find( '.' + $.trim(settings.klass.selectMonth).replace(/ +/, '.') ).on( 'change', function() {
                 var value = this.value
                 if ( value ) {
                     picker.set( 'highlight', [ picker.get( 'view' ).year, value, picker.get( 'highlight' ).date ] )
-                    picker.$root.find( '.' + settings.klass.selectMonth ).trigger( 'focus' )
+                    picker.$root.find( '.' + $.trim(settings.klass.selectMonth).replace(/ +/, '.') ).trigger( 'focus' )
                 }
             })
-            picker.$root.find( '.' + settings.klass.selectYear ).on( 'change', function() {
+            picker.$root.find( '.' + $.trim(settings.klass.selectYear).replace(/ +/, '.') ).on( 'change', function() {
                 var value = this.value
                 if ( value ) {
                     picker.set( 'highlight', [ value, picker.get( 'view' ).month, picker.get( 'highlight' ).date ] )
-                    picker.$root.find( '.' + settings.klass.selectYear ).trigger( 'focus' )
+                    picker.$root.find( '.' + $.trim(settings.klass.selectYear).replace(/ +/, '.') ).trigger( 'focus' )
                 }
             })
         }, 1 ).