diff --git a/changelog/55_UNRELEASED_2019-xx-xx.md b/changelog/55_UNRELEASED_2019-xx-xx.md
index f851ed91..57b43652 100644
--- a/changelog/55_UNRELEASED_2019-xx-xx.md
+++ b/changelog/55_UNRELEASED_2019-xx-xx.md
@@ -29,6 +29,8 @@
- New endpoints for the stock transfer & stock entry edit capabilities mentioned above
### General & other improvements/fixes
+- It's now possible to keep the screen on always or when a "fullscreen-card" (e. g. used for recipes) is displayed
+ - New user options in the display settings menu in the top right corner (default is disabled)
- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
- Slightly optimized table loading & search performance (thanks @lwis)
diff --git a/config-dist.php b/config-dist.php
index 95dfbc32..bf2ca90a 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -75,6 +75,10 @@ DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
+# Keep screen on settings
+DefaultUserSetting('keep_screen_on', false); // Keep the screen always on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the screen on when a "fullscreen-card" is displayed
+
# Stock settings
DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
diff --git a/localization/strings.pot b/localization/strings.pot
index 211374d2..408f8b77 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1609,3 +1609,9 @@ msgstr ""
msgid "Camera access is on only possible when supported and allowed by your browser and when grocy is served via a secure (https://) connection"
msgstr ""
+
+msgid "Keep screen on"
+msgstr ""
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
diff --git a/package.json b/package.json
index 3304ae6c..eaadff35 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"jquery-serializejson": "^2.9.0",
"jquery-ui-dist": "^1.12.1",
"moment": "^2.24.0",
+ "nosleep.js": "^0.9.0",
"quagga": "^0.12.1",
"sprintf-js": "^1.1.2",
"startbootstrap-sb-admin": "^4.0.0",
diff --git a/public/js/grocy_wakelockhandling.js b/public/js/grocy_wakelockhandling.js
new file mode 100644
index 00000000..a18b3a31
--- /dev/null
+++ b/public/js/grocy_wakelockhandling.js
@@ -0,0 +1,72 @@
+Grocy.WakeLock = { };
+Grocy.WakeLock.NoSleepJsIntance = null;
+Grocy.WakeLock.InitDone = false;
+
+$("#keep_screen_on").on("change", function()
+{
+ var value = $(this).is(":checked");
+ if (value)
+ {
+ Grocy.WakeLock.Enable();
+ }
+ else
+ {
+ Grocy.WakeLock.Disable();
+ }
+});
+
+Grocy.WakeLock.Enable = function()
+{
+ if (Grocy.WakeLock.NoSleepJsIntance === null)
+ {
+ Grocy.WakeLock.NoSleepJsIntance = new NoSleep();
+ }
+ Grocy.WakeLock.NoSleepJsIntance.enable();
+ Grocy.WakeLock.InitDone = true;
+}
+
+Grocy.WakeLock.Disable = function()
+{
+ if (Grocy.WakeLock.NoSleepJsIntance !== null)
+ {
+ Grocy.WakeLock.NoSleepJsIntance.disable();
+ }
+}
+
+// Handle "Keep screen on while displaying a fullscreen-card" when the body class "fullscreen-card" has changed
+new MutationObserver(function(mutations)
+{
+ if (BoolVal(Grocy.UserSettings.keep_screen_on_when_fullscreen_card) && !BoolVal(Grocy.UserSettings.keep_screen_on))
+ {
+ mutations.forEach(function(mutation)
+ {
+ if (mutation.attributeName === "class")
+ {
+ var attributeValue = $(mutation.target).prop(mutation.attributeName);
+ if (attributeValue.contains("fullscreen-card"))
+ {
+ Grocy.WakeLock.Enable();
+ }
+ else
+ {
+ Grocy.WakeLock.Disable();
+ }
+ }
+ });
+ }
+}).observe(document.body, {
+ attributes: true
+});
+
+// Enabling NoSleep.Js only works in a user input event handler,
+// so if the user wants to keep the screen on always,
+// do this in on the first click on anything
+$(document).click(function()
+{
+ if (Grocy.WakeLock.InitDone === false && BoolVal(Grocy.UserSettings.keep_screen_on))
+ {
+ Grocy.WakeLock.Enable();
+ }
+
+ Grocy.WakeLock.InitDone = true;
+});
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 47816c64..3d70c80c 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -360,6 +360,23 @@
+
+