diff --git a/Makefile.common b/Makefile.common
index 72f88223ea..6218fa317a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -865,7 +865,8 @@ endif
 ifeq ($(HAVE_WAYLAND), 1)
  OBJ += gfx/drivers_context/wayland_ctx.o \
 		  input/drivers/wayland_input.o \
-		  gfx/common/wayland/xdg-shell.o
+		  gfx/common/wayland/xdg-shell.o \
+		  gfx/common/wayland/idle-inhibit-unstable-v1.o
  ifeq ($(HAVE_EGL), 1)
    LIBS += $(EGL_LIBS)
  endif
diff --git a/gfx/common/wayland/generate_wayland_protos.sh b/gfx/common/wayland/generate_wayland_protos.sh
index 8abc2ed1a0..c3b4c9f220 100755
--- a/gfx/common/wayland/generate_wayland_protos.sh
+++ b/gfx/common/wayland/generate_wayland_protos.sh
@@ -10,3 +10,7 @@ fi
 #Generate xdg-shell header and .c files
 $WAYSCAN client-header $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.h
 $WAYSCAN private-code $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.c
+
+#Generate idle-inhibit header and .c files
+$WAYSCAN client-header $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.h
+$WAYSCAN private-code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.c
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index aaaf22e36c..ac083651a1 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -42,15 +42,14 @@
 #include "../common/gl_common.h"
 #endif
 
-#ifdef HAVE_DBUS
-#include "../common/dbus_common.h"
-#endif
-
 #include "../common/wayland_common.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../input/input_driver.h"
 #include "../../input/input_keymaps.h"
 
+/* Generated from idle-inhibit-unstable-v1.xml */
+#include "../common/wayland/idle-inhibit-unstable-v1.h"
+
 /* Generated from xdg-shell.xml */
 #include "../common/wayland/xdg-shell.h"
 
@@ -93,6 +92,8 @@ typedef struct gfx_ctx_wayland_data
    struct wl_touch *wl_touch;
    struct wl_seat *seat;
    struct wl_shm *shm;
+   struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager;
+   struct zwp_idle_inhibitor_v1 *idle_inhibitor;
    int swap_interval;
    bool core_hw_context_enable;
 
@@ -684,6 +685,9 @@ static void registry_handle_global(void *data, struct wl_registry *reg,
       wl->seat = (struct wl_seat*)wl_registry_bind(reg, id, &wl_seat_interface, 2);
       wl_seat_add_listener(wl->seat, &seat_listener, wl);
    }
+   else if (string_is_equal(interface, "zwp_idle_inhibit_manager_v1"))
+      wl->idle_inhibit_manager = (struct zwp_idle_inhibit_manager_v1*)wl_registry_bind(
+                                  reg, id, &zwp_idle_inhibit_manager_v1_interface, 1);
 }
 
 static void registry_handle_global_remove(void *data,
@@ -766,6 +770,10 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl)
       xdg_surface_destroy(wl->xdg_surface);
    if (wl->surface)
       wl_surface_destroy(wl->surface);
+   if (wl->idle_inhibit_manager)
+      zwp_idle_inhibit_manager_v1_destroy(wl->idle_inhibit_manager);
+   if (wl->idle_inhibitor)
+      zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor);
 
    if (wl->input.dpy)
    {
@@ -786,10 +794,6 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl)
    wl->width      = 0;
    wl->height     = 0;
 
-#ifdef HAVE_DBUS
-   dbus_screensaver_uninhibit();
-   dbus_close_connection();
-#endif
 }
 
 void flush_wayland_fd(void *data)
@@ -1072,6 +1076,11 @@ static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver)
       RARCH_ERR("[Wayland]: Failed to create shell.\n");
       goto error;
    }
+   
+   if (!wl->idle_inhibit_manager)
+   {
+	   RARCH_WARN("[Wayland]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol!\n");
+   }
 
    wl->input.fd = wl_display_get_fd(wl->input.dpy);
 
@@ -1124,10 +1133,6 @@ static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver)
 
    flush_wayland_fd(&wl->input);
 
-#ifdef HAVE_DBUS
-   dbus_ensure_connection();
-#endif
-
    return wl;
 
 error:
@@ -1406,16 +1411,25 @@ static bool gfx_ctx_wl_has_focus(void *data)
    return wl->input.keyboard_focus;
 }
 
-static bool gfx_ctx_wl_suppress_screensaver(void *data, bool enable)
+static bool gfx_ctx_wl_suppress_screensaver(void *data, bool state)
 {
-   (void)data;
-   (void)enable;
-
-#ifdef HAVE_DBUS
-   return dbus_suspend_screensaver(enable);
-#endif
-
-   return true;
+	(void)data;
+	gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
+	
+    if (!wl->idle_inhibit_manager)
+        return false;
+    if (state == (!!wl->idle_inhibitor))
+        return true;
+    if (state) {
+        RARCH_LOG("[Wayland]: Enabling idle inhibitor\n");
+        struct zwp_idle_inhibit_manager_v1 *mgr = wl->idle_inhibit_manager;
+        wl->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(mgr, wl->surface);
+    } else {
+        RARCH_LOG("[Wayland]: Disabling the idle inhibitor\n");
+        zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor);
+        wl->idle_inhibitor = NULL;
+    }
+    return true;
 }
 
 static bool gfx_ctx_wl_has_windowed(void *data)