diff --git a/examples/controllers/oculus/virtualKeyboardTextEntityExample.js b/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
index 794b659bcb..c3cb3c6316 100644
--- a/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
+++ b/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
@@ -27,7 +27,7 @@ const TEXT_MARGIN_RIGHT = 0.17;
 const TEXT_MARGIN_BOTTOM = 0.17;
 
 var windowDimensions = Controller.getViewportDimensions();
-var cursor = null;
+var cursor = new Cursor();
 var keyboard = new Keyboard();
 var textFontSize = 9;
 var text = null;
@@ -70,7 +70,7 @@ keyboard.onKeyRelease = function(event) {
     // you can cancel a key by releasing its focusing before releasing it
     if (event.focus) {
         if (event.event == 'delete') {
-           deleteChar();
+            deleteChar();
         } else if (event.event == 'submit') {
            print(textText);
 
@@ -83,12 +83,14 @@ keyboard.onKeyRelease = function(event) {
            if (maxLineWidth < usernameWidth) {
                maxLineWidth = usernameWidth;
            } else {
-               var spaceableWidth = maxLineWidth - usernameWidth;
-               var spaceWidth = Overlays.textSize(textSizeMeasureOverlay, " ").width;
-               var numberOfSpaces = Math.floor(spaceableWidth / spaceWidth);
-               for (var i = 0; i < numberOfSpaces; i++) {
-                   usernameLine = " " + usernameLine;
-               }
+                var spaceableWidth = maxLineWidth - usernameWidth;
+                //TODO: WORKAROUND WARNING BELOW Fix this when spaces are not trimmed out of the textsize calculation anymore
+                var spaceWidth = Overlays.textSize(textSizeMeasureOverlay, "| |").width
+                    - Overlays.textSize(textSizeMeasureOverlay, "||").width;
+                var numberOfSpaces = Math.floor(spaceableWidth / spaceWidth);
+                for (var i = 0; i < numberOfSpaces; i++) {
+                    usernameLine = " " + usernameLine;
+                }
            }
            var dimension_x = maxLineWidth + TEXT_MARGIN_RIGHT + TEXT_MARGIN_LEFT;
            if (position.x > 0 && position.y > 0 && position.z > 0) {
@@ -100,7 +102,7 @@ keyboard.onKeyRelease = function(event) {
                    backgroundColor: { red: 0, green: 0, blue: 0 },
                    textColor: { red: 255, green: 255, blue: 255 },
                    text: textText + "\n" + usernameLine,
-				   lineHeight: 0.1
+                   lineHeight: 0.1
                });
            }
            textText = "";
@@ -127,7 +129,7 @@ keyboard.onFullyLoaded = function() {
     });
     updateTextOverlay();
     // the cursor is being loaded after the keyboard, else it will be on the background of the keyboard 
-    cursor = new Cursor();
+    cursor.initialize();
     cursor.onUpdate = function(position) {
         keyboard.setFocusPosition(position.x, position.y);
     };