diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
new file mode 100644
index 000000000..e5ed8a3de
--- /dev/null
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -0,0 +1,28 @@
+#ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
+#define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
+#include <wlr/types/wlr_idle_inhibit_v1.h>
+#include <wlr/types/wlr_idle.h>
+#include "sway/server.h"
+
+struct sway_idle_inhibit_manager_v1 {
+	struct wlr_idle_inhibit_manager_v1 *wlr_manager;
+	struct wl_listener new_idle_inhibitor_v1;
+	struct wl_list inhibitors;
+
+	struct wlr_idle *idle;
+};
+
+struct sway_idle_inhibitor_v1 {
+	struct sway_idle_inhibit_manager_v1 *manager;
+	struct sway_view *view;
+
+	struct wl_list link;
+	struct wl_listener destroy;
+};
+
+void idle_inhibit_v1_check_active(
+	struct sway_idle_inhibit_manager_v1 *manager);
+
+struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
+	struct wl_display *wl_display, struct wlr_idle *idle);
+#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 1e1aa3cc0..a3e32898d 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -23,12 +23,14 @@ struct sway_server {
 
 	struct wlr_compositor *compositor;
 	struct wlr_data_device_manager *data_device_manager;
-	struct wlr_idle *idle;
 
 	struct sway_input_manager *input;
 
 	struct wl_listener new_output;
 
+	struct wlr_idle *idle;
+	struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;
+
 	struct wlr_layer_shell *layer_shell;
 	struct wl_listener layer_shell_surface;
 
@@ -61,6 +63,7 @@ void server_run(struct sway_server *server);
 
 void handle_new_output(struct wl_listener *listener, void *data);
 
+void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
new file mode 100644
index 000000000..c02ca26e5
--- /dev/null
+++ b/sway/desktop/idle_inhibit_v1.c
@@ -0,0 +1,79 @@
+#include <stdlib.h>
+#include <wlr/types/wlr_idle.h>
+#include "log.h"
+#include "sway/desktop/idle_inhibit_v1.h"
+#include "sway/tree/view.h"
+#include "sway/server.h"
+
+
+static void handle_destroy(struct wl_listener *listener, void *data) {
+	struct sway_idle_inhibitor_v1 *inhibitor =
+		wl_container_of(listener, inhibitor, destroy);
+	wlr_log(L_DEBUG, "Sway idle inhibitor destroyed");
+	wl_list_remove(&inhibitor->link);
+	wl_list_remove(&inhibitor->destroy.link);
+	idle_inhibit_v1_check_active(inhibitor->manager);
+	free(inhibitor);
+}
+
+void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
+	struct wlr_idle_inhibitor_v1 *wlr_inhibitor = data;
+	struct sway_idle_inhibit_manager_v1 *manager =
+		wl_container_of(listener, manager, new_idle_inhibitor_v1);
+	wlr_log(L_DEBUG, "New sway idle inhibitor");
+
+	struct sway_idle_inhibitor_v1 *inhibitor =
+		calloc(1, sizeof(struct sway_idle_inhibitor_v1));
+	if (!inhibitor) {
+		return;
+	}
+
+	inhibitor->manager = manager;
+	inhibitor->view = view_from_wlr_surface(wlr_inhibitor->surface);
+	wl_list_insert(&manager->inhibitors, &inhibitor->link);
+
+
+	inhibitor->destroy.notify = handle_destroy;
+	wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy);
+
+	idle_inhibit_v1_check_active(manager);
+}
+
+void idle_inhibit_v1_check_active(
+		struct sway_idle_inhibit_manager_v1 *manager) {
+	struct sway_idle_inhibitor_v1 *inhibitor;
+	bool inhibited = false;
+	wl_list_for_each(inhibitor, &manager->inhibitors, link) {
+		if (!inhibitor->view) {
+			/* Cannot guess if view is visible so assume it is */
+			inhibited = true;
+			break;
+		}
+		if (view_is_visible(inhibitor->view)) {
+			inhibited = true;
+			break;
+		}
+	}
+	wlr_idle_set_enabled(manager->idle, NULL, !inhibited);
+}
+
+struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
+		struct wl_display *wl_display, struct wlr_idle *idle) {
+	struct sway_idle_inhibit_manager_v1 *manager =
+		calloc(1, sizeof(struct sway_idle_inhibit_manager_v1));
+	if (!manager) {
+		return NULL;
+	}
+
+	manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display);
+	if (!manager->wlr_manager) {
+		return NULL;
+	}
+	manager->idle = idle;
+	wl_signal_add(&manager->wlr_manager->events.new_inhibitor,
+		&manager->new_idle_inhibitor_v1);
+	manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1;
+	wl_list_init(&manager->inhibitors);
+
+	return manager;
+}
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index cb5249997..7b670aec1 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -6,6 +6,7 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_linux_dmabuf.h>
 #include "sway/debug.h"
+#include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
 #include "sway/output.h"
 #include "sway/tree/container.h"
@@ -245,6 +246,7 @@ static void transaction_progress_queue() {
 		transaction_destroy(transaction);
 	}
 	server.transactions->length = 0;
+	idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
 }
 
 static int handle_timeout(void *data) {
@@ -320,6 +322,7 @@ void transaction_commit(struct sway_transaction *transaction) {
 		wlr_log(L_DEBUG, "Transaction %p has nothing to wait for", transaction);
 		transaction_apply(transaction);
 		transaction_destroy(transaction);
+		idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
 		return;
 	}
 
diff --git a/sway/meson.build b/sway/meson.build
index 9ff3f05f1..a81a3406f 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -10,6 +10,7 @@ sway_sources = files(
 	'security.c',
 
 	'desktop/desktop.c',
+	'desktop/idle_inhibit_v1.c',
 	'desktop/layer_shell.c',
 	'desktop/output.c',
 	'desktop/transaction.c',
diff --git a/sway/server.c b/sway/server.c
index bd1076170..8106f3c86 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -22,6 +22,7 @@
 // TODO WLR: make Xwayland optional
 #include "list.h"
 #include "sway/config.h"
+#include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/input/input-manager.h"
 #include "sway/server.h"
 #include "sway/tree/layout.h"
@@ -52,7 +53,6 @@ bool server_init(struct sway_server *server) {
 	server->data_device_manager =
 		wlr_data_device_manager_create(server->wl_display);
 
-	server->idle = wlr_idle_create(server->wl_display);
 	wlr_screenshooter_create(server->wl_display);
 	wlr_gamma_control_manager_create(server->wl_display);
 	wlr_primary_selection_device_manager_create(server->wl_display);
@@ -63,6 +63,10 @@ bool server_init(struct sway_server *server) {
 	wlr_xdg_output_manager_create(server->wl_display,
 			root_container.sway_root->output_layout);
 
+	server->idle = wlr_idle_create(server->wl_display);
+	server->idle_inhibit_manager_v1 =
+		sway_idle_inhibit_manager_v1_create(server->wl_display, server->idle);
+
 	server->layer_shell = wlr_layer_shell_create(server->wl_display);
 	wl_signal_add(&server->layer_shell->events.new_surface,
 		&server->layer_shell_surface);