diff --git a/Changelog.md b/Changelog.md
index 63c38d20f6a6644b45ee85e31c675ddf54b46f3e..7f0b5bbedcacf477d2268d984cf10436bb157406 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -36,6 +36,7 @@
 * Restore truncated URLs when posting to Twitter [#4211](https://github.com/diaspora/diaspora/issues/4211)
 * Fix mobile search tags [#4392](https://github.com/diaspora/diaspora/issues/4392)
 * Remove placeholders for name fields in settings (no more Sofaer) [#4385](https://github.com/diaspora/diaspora/pull/4385)
+* Problems with layout the registration page for mobile. [#4396](https://github.com/diaspora/diaspora/issues/4396)
 
 ## Features
 * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index c7377f4edc66256f94aa869b71d0030ab6e619e7..57483d2877aa55cdfff7d6d5eb3eca5c70123cfd 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -5,7 +5,7 @@
 class RegistrationsController < Devise::RegistrationsController
   before_filter :check_registrations_open_or_vaild_invite!, :check_valid_invite!
 
-  layout "with_header", :only => [:new]
+  layout ->(c) { request.format == :mobile ? "application" : "with_header" }, :only => [:new]
   before_filter -> { @css_framework = :bootstrap }, only: [:new]
 
   def create