diff --git a/CHANGELOG b/CHANGELOG
index a63aea7ca28d10feb35f5b0c9ea8ee5465dde79a..3144175db89b0dae614255705ed670ebffe3e73c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 8.1.0 (unreleased)
   - Fix anchors to comments in diffs
   - Move CI web hooks page to project settings area
   - Fix User Identities API. It now allows you to properly create or update user's identities.
+  - Add user preference to change layout width (Peter Göbel)
 
 v 8.0.3
   - Fix URL shown in Slack notifications
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index f83b4abd1e2f8753cd4ffd9ccb291505884ed6db..a9a06ecc80801f30d380e69f3e08a0ba7bf18590 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -31,6 +31,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
   def preferences_params
     params.require(:user).permit(
       :color_scheme_id,
+      :layout,
       :dashboard,
       :project_view,
       :theme_id
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index df37be51ce9603b70682760baedea04aa8fd7e28..775cf5a3dd4d2dc119bffc629a4c4f988a4605b4 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -26,7 +26,7 @@ module PageLayoutHelper
 
   def fluid_layout(enabled = false)
     if @fluid_layout.nil?
-      @fluid_layout = enabled
+      @fluid_layout = (current_user && current_user.layout == "fluid") || enabled
     else
       @fluid_layout
     end
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 1b1f4162df41601fecc3d8216396c4c72269a646..4710171ebaaf2b4ece5e7bc151a27f05164619d3 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -1,5 +1,12 @@
 # Helper methods for per-User preferences
 module PreferencesHelper
+  def layout_choices
+    [
+        ['Fixed', :fixed],
+        ['Fluid', :fluid]
+    ]
+  end
+
   # Maps `dashboard` values to more user-friendly option text
   DASHBOARD_CHOICES = {
     projects: 'Your Projects (default)',
diff --git a/app/models/user.rb b/app/models/user.rb
index c7e3992b6a166fece09544fd9a3934c57f702503..889d2d3b867e5e642a8e89f42f70568ecdb5e3dd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -54,6 +54,7 @@
 #  public_email               :string(255)      default(""), not null
 #  dashboard                  :integer          default(0)
 #  project_view               :integer          default(0)
+#  layout                     :integer          default(0)
 #
 
 require 'carrierwave/orm/activerecord'
@@ -172,6 +173,9 @@ class User < ActiveRecord::Base
   after_create :post_create_hook
   after_destroy :post_destroy_hook
 
+  # User's Layout preference
+  enum layout: [:fixed, :fluid]
+
   # User's Dashboard preference
   # Note: When adding an option, it MUST go on the end of the array.
   enum dashboard: [:projects, :stars, :project_activity, :starred_project_activity]
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 60289bfe7cd88b2bbc1224dbe6ebde23c33ac53c..01e285a8dfa4cdf55bad3ea105a79a85da1ee73b 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -32,6 +32,13 @@
     .panel-heading
       Behavior
     .panel-body
+      .form-group
+        = f.label :layout, class: 'control-label' do
+          Layout width
+        .col-sm-10
+          = f.select :layout, layout_choices, {}, class: 'form-control'
+          .help-block
+            Choose between fixed (max. 1200px) and fluid (100%) application layout
       .form-group
         = f.label :dashboard, class: 'control-label' do
           Default Dashboard
diff --git a/app/views/profiles/preferences/update.js.erb b/app/views/profiles/preferences/update.js.erb
index 6c4b0ce757dbe447191d02e722391b4bd36b9e6d..4433cab7782f5ea3a0be4e3f386da29562cd675c 100644
--- a/app/views/profiles/preferences/update.js.erb
+++ b/app/views/profiles/preferences/update.js.erb
@@ -2,6 +2,13 @@
 $('body').removeClass('<%= Gitlab::Themes.body_classes %>')
 $('body').addClass('<%= user_application_theme %>')
 
+// Toggle container-fluid class
+if ('<%= current_user.layout %>' === 'fluid') {
+  $('.content-wrapper').find('.container-fluid').removeClass('container-limited')
+} else {
+  $('.content-wrapper').find('.container-fluid').addClass('container-limited')
+}
+
 // Re-enable the "Save" button
 $('input[type=submit]').enable()
 
diff --git a/db/migrate/20151005150751_add_layout_option_for_users.rb b/db/migrate/20151005150751_add_layout_option_for_users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ead9b1f89774579614e0b536ef7d3e94ba8cc71e
--- /dev/null
+++ b/db/migrate/20151005150751_add_layout_option_for_users.rb
@@ -0,0 +1,5 @@
+class AddLayoutOptionForUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :layout, :integer, default: 0
+  end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 0e8d54fb267b027e6af0f0cf091e7605602e465a..5b114a2901151b3cea9f315df8a9c8bba7a277c9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151005075649) do
+ActiveRecord::Schema.define(version: 20151005150751) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -758,6 +758,7 @@ ActiveRecord::Schema.define(version: 20151005075649) do
     t.integer  "dashboard",                  default: 0
     t.integer  "project_view",               default: 0
     t.integer  "consumed_timestep"
+    t.integer  "layout",                     default: 0
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree