diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 4e629b107..3dc173b99 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -487,7 +487,7 @@ const InputSourceIndicator = new Lang.Class({
             let is = new InputSource(type, id, displayName, shortName, i);
 
             is.connect('activate', Lang.bind(this, function() {
-                if (this._currentSource.index == is.index)
+                if (this._currentSource && this._currentSource.index == is.index)
                     return;
                 this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
                                          GLib.Variant.new_uint32(is.index));