2 files changed, 5 insertions, 2 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 4f8ba49ac49d..6790dc8cff99 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -5409,7 +5409,8 @@ void hci_update_background_scan(struct hci_dev *hdev)
 
         hci_req_init(&req, hdev);
 
-        if (list_empty(&hdev->pend_le_conns) &&
+        if (!test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
+            list_empty(&hdev->pend_le_conns) &&
             list_empty(&hdev->pend_le_reports)) {
                 /* If there is no pending LE connections or devices
                  * to be scanned for, we should stop the background
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 40244fc0e326..ef675acbcfce 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1750,8 +1750,10 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status)
 
         send_settings_rsp(cmd->sk, MGMT_OP_SET_CONNECTABLE, hdev);
 
-        if (changed)
+        if (changed) {
                 new_settings(hdev, cmd->sk);
+                hci_update_background_scan(hdev);
+        }
 
 remove_cmd:
         mgmt_pending_remove(cmd);