1 files changed, 5 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index a975fa8..394922f 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -293,6 +293,8 @@ void RootWindowController::InitForPrimaryDisplay() {
   if (Shell::GetInstance()->delegate()->IsUserLoggedIn())
     shelf_->CreateLauncher();
 
+  // TODO(bryeung): Move this to CreateContainersInRootWindow when the
+  // keyboard controller will take care of deferring creation of the keyboard.
   InitKeyboard();
 }
 
@@ -511,6 +513,9 @@ void RootWindowController::InitKeyboard() {
     aura::Window* keyboard_container =
         keyboard_controller_->GetContainerWindow();
     parent->AddChild(keyboard_container);
+    // TODO(bryeung): move this to the controller on visibility changed
+    parent->StackChildAtTop(keyboard_container);
+    keyboard_container->Show();
   }
 }