diff --git a/CHANGES.md b/CHANGES.md
index 9523d26742c25cc7280b01f0c4d96a4a84369a37..d6d089e7c2def68ed2a06b851093b07c0673dacf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2018-01-12 - Fixed bug for the frontpage settings.
 * 2018-01-12 - Fixed bug for the profile editing button in admin view.
 * 2018-01-11 - Fixed bug in the hierarchical displaying of lists within the course.
 * 2017-12-05 - Added Workaround to travis.yml for fixing Behat tests with TravisCI.
diff --git a/amd/build/incoursesettings.min.js b/amd/build/incoursesettings.min.js
index dc2ad809cddf5b917fb32fd18297fdcf5379843e..4aaf698825444c73096994b41d344726c08f1562 100644
--- a/amd/build/incoursesettings.min.js
+++ b/amd/build/incoursesettings.min.js
@@ -1 +1 @@
-define(["jquery"],function(a){"use strict";function b(){var b=a("#boost-campus-course-settings"),c=a("#boost-campus-activity-settings");a("#page-header .context-header-settings-menu").on("click",function(a){a.stopPropagation(),b.is(":visible")?b.hide(400):(b.show(400),c.is(":visible")&&c.hide(400))}),a("#region-main-settings-menu .action-menu .dropdown-toggle").on("click",function(a){a.stopPropagation(),c.is(":visible")?c.hide(400):(c.show(400),b.is(":visible")&&b.hide(400))})}return{init:function(){b()}}});
\ No newline at end of file
+define(["jquery"],function(a){"use strict";function b(){var b=a("#boost-campus-course-settings"),c=a("#boost-campus-activity-settings"),d=a("body").hasClass("pagelayout-frontpage");d||(a("#page-header .context-header-settings-menu").on("click",function(a){a.stopPropagation(),b.is(":visible")?b.hide(400):(b.show(400),c.is(":visible")&&c.hide(400))}),a("#region-main-settings-menu .action-menu .dropdown-toggle").on("click",function(a){a.stopPropagation(),c.is(":visible")?c.hide(400):(c.show(400),b.is(":visible")&&b.hide(400))}))}return{init:function(){b()}}});
\ No newline at end of file
diff --git a/amd/src/incoursesettings.js b/amd/src/incoursesettings.js
index 544e9d9b81f20a69933f0e0f0f973497278c83ea..dd5f94d14fc471c053196c5ed2fd409e6b8f06c9 100644
--- a/amd/src/incoursesettings.js
+++ b/amd/src/incoursesettings.js
@@ -30,31 +30,36 @@ define(['jquery'], function($) {
     function initInCourseSettings() {
         var courseSettings = $('#boost-campus-course-settings');
         var activitySettings = $('#boost-campus-activity-settings');
+        var frontpage = $('body').hasClass('pagelayout-frontpage');
 
-        $('#page-header .context-header-settings-menu').on('click', function(event) {
-            event.stopPropagation();
-            if (courseSettings.is(":visible")) {
-                courseSettings.hide(400);
-            } else {
-                courseSettings.show(400);
-                // Additionally close activity settings if they are currently open.
-                if (activitySettings.is(":visible")) {
-                    activitySettings.hide(400);
-                }
-            }
-        });
-        $('#region-main-settings-menu .action-menu .dropdown-toggle').on('click', function(event) {
-            event.stopPropagation();
-            if (activitySettings.is(":visible")) {
-                activitySettings.hide(400);
-            } else {
-                activitySettings.show(400);
-                // Additionally close course settings if they are currently open.
+        // Only change the behaviour if the setting is enabled and we are not on the frontpage,
+        // because we did not change the settings menu there. So we need the default propagation here.
+        if (!frontpage) {
+            $('#page-header .context-header-settings-menu').on('click', function (event) {
+                event.stopPropagation();
                 if (courseSettings.is(":visible")) {
                     courseSettings.hide(400);
+                } else {
+                    courseSettings.show(400);
+                    // Additionally close activity settings if they are currently open.
+                    if (activitySettings.is(":visible")) {
+                        activitySettings.hide(400);
+                    }
                 }
-            }
-        });
+            });
+            $('#region-main-settings-menu .action-menu .dropdown-toggle').on('click', function (event) {
+                event.stopPropagation();
+                if (activitySettings.is(":visible")) {
+                    activitySettings.hide(400);
+                } else {
+                    activitySettings.show(400);
+                    // Additionally close course settings if they are currently open.
+                    if (courseSettings.is(":visible")) {
+                        courseSettings.hide(400);
+                    }
+                }
+            });
+        }
     }
 
     return {