diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 7358c6e8544..fb00acf5199 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -652,7 +652,7 @@ static void client_idle_handler(struct tevent_context *ev,
         goto done;
     }
 
-    if ((now - cctx->last_request_time) > cctx->rctx->client_idle_timeout) {
+    if ((now - cctx->last_request_time) >= cctx->rctx->client_idle_timeout) {
         /* This connection is idle. Terminate it */
         DEBUG(SSSDBG_TRACE_INTERNAL,
               "Terminating idle client [%p][%d]\n",
@@ -677,7 +677,7 @@ errno_t reset_client_idle_timer(struct cli_ctx *cctx)
 static errno_t setup_client_idle_timer(struct cli_ctx *cctx)
 {
     struct timeval tv =
-            tevent_timeval_current_ofs(cctx->rctx->client_idle_timeout/2, 0);
+            tevent_timeval_current_ofs(cctx->rctx->client_idle_timeout/2 + 1, 0);
 
     talloc_zfree(cctx->idle);
 
diff --git a/src/sbus/sbus_message.h b/src/sbus/sbus_message.h
index 7ae634ece33..7b85948c15b 100644
--- a/src/sbus/sbus_message.h
+++ b/src/sbus/sbus_message.h
@@ -29,8 +29,10 @@
 
 /* Use longer default timeout than libdbus default due to expensive
  * selinux operation: see https://bugzilla.redhat.com/show_bug.cgi?id=1654537
+ * Another example of a very long running operation - BE_REQ_INITGROUPS where
+ * the user is a member of tens of thousands of groups.
  */
-#define SBUS_MESSAGE_TIMEOUT 120000
+#define SBUS_MESSAGE_TIMEOUT 300000
 
 /**
  * Bound message with a talloc context.