diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index b6c119668e135129333ed92078040cc00497098c..958fb4014c39c1bae6353c87995a13f26982c8bd 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -374,6 +374,11 @@ static const char *const ppsz_pos_descriptions[] =
 #define SS_TEXT N_("Disable screensaver")
 #define SS_LONGTEXT N_("Disable the screensaver during video playback." )
 
+static const int screensaver_values[] = { 0, 2, 1, };
+static const char *const screensaver_texts[] = {
+    N_("Never"), N_("When fullscreen"), N_("Always"),
+};
+
 #define VIDEO_DECO_TEXT N_("Window decorations")
 #define VIDEO_DECO_LONGTEXT N_( \
     "VLC can avoid creating window caption, frames, etc... around the video" \
@@ -1623,8 +1628,8 @@ vlc_module_begin ()
               VIDEO_ON_TOP_LONGTEXT, false )
     add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
               WALLPAPER_LONGTEXT, false )
-    add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
-              true )
+    add_integer("disable-screensaver", 1, SS_TEXT, SS_LONGTEXT, true)
+        change_integer_list(screensaver_values, screensaver_texts)
 
     add_bool( "video-title-show", 1, VIDEO_TITLE_SHOW_TEXT,
               VIDEO_TITLE_SHOW_LONGTEXT, false )
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 80b1f6c6c71f0f9f19eb814cf0e5e23921f281c7..4aba087abc9cd0c7bf750cf2ba3e8c216f0d3734 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -79,7 +79,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj, const char *module,
     }
 
     /* Hook for screensaver inhibition */
-    if (var_InheritBool(obj, "disable-screensaver"))
+    if (var_InheritInteger(obj, "disable-screensaver"))
         w->inhibit = vlc_inhibit_Create(VLC_OBJECT(window));
     else
         w->inhibit = NULL;