diff --git a/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml b/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
index 764f04a..6704c1b 100644
--- a/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
+++ b/ShimmerBLE/BLE.Client/BLE.Client/Pages/DeviceListPage.xaml
@@ -348,13 +348,16 @@
                     -->
                                     <ScrollView Orientation="Horizontal">
                                         <StackLayout Orientation="Horizontal">
-                                            <Button Text="Start Scan"
+                                            <Button Text="Start Scan" 
+                                IsEnabled="{Binding IsScanPairAndConnectEnabled}"
                                 Command="{Binding RefreshCommand}"
                                 HorizontalOptions="End" />
-                                            <Button Text="Stop Scan"
+                                            <Button Text="Stop Scan" 
+                                IsEnabled="{Binding IsScanPairAndConnectEnabled}"
                                 Command="{Binding StopScanCommand}"
                                 HorizontalOptions="End" />
-                                            <Button Text="Pair"
+                                            <Button Text="Pair" 
+                            IsEnabled="{Binding IsScanPairAndConnectEnabled}"
                             Command="{Binding PairCommand}"
                             HorizontalOptions="End" />
                                         </StackLayout>
@@ -411,7 +414,8 @@
 
                                     <ScrollView Orientation="Horizontal">
                                         <StackLayout Orientation="Horizontal">
-                                            <Button Text="Connect"
+                                            <Button Text="Connect" 
+                            IsEnabled="{Binding IsScanPairAndConnectEnabled}"
                             Command="{Binding ConnectCommand}"/>
                                             <Button Text="Disconnect"
                             Command="{Binding DisconnectVRECommand}"
@@ -456,6 +460,7 @@
                             Command="{Binding SoftResetCommand}"
                             HorizontalOptions="End"/>
                                             <Button Text="Connect Without Initialize"
+                            IsEnabled="{Binding IsScanPairAndConnectEnabled}"
                             Command="{Binding ConnectWithoutInitializeCommand}"
                             HorizontalOptions="End" />
                                             <!--
diff --git a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
index 7ef5a15..c347a25 100644
--- a/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
+++ b/ShimmerBLE/BLE.Client/BLE.Client/ViewModels/DeviceListViewModel.cs
@@ -41,6 +41,7 @@
 using ShimmerAdvanceBLEAPI;
 using ShimmerBLEAPI.Communications;
 using shimmer.DTO;
+using Acr.Collections;
 
 namespace BLE.Client.ViewModels
 {
@@ -131,6 +132,7 @@ public String PairingStatus
         public MvxCommand ConnectWithoutInitializeCommand => new MvxCommand(() => Connect(false));
 
         public ObservableCollection<DeviceListItemViewModel> Devices { get; set; } = new ObservableCollection<DeviceListItemViewModel>();
+        public ObservableCollection<DeviceListItemViewModel> ListOfScannedDevicesTemp { get; set; } = new ObservableCollection<DeviceListItemViewModel>();
         public ObservableCollection<VerisenseSerialDevice> SerialDevices { get; set; } = new ObservableCollection<VerisenseSerialDevice>();
         public bool IsRefreshing => (Adapter != null) ? Adapter.IsScanning : false;
         public bool IsStateOn => _bluetoothLe.IsOn;
@@ -1890,7 +1892,10 @@ private void AddOrUpdateDevice(VerisenseBLEScannedDevice device)
                 }
                 else
                 {
-                    Devices.Add(new DeviceListItemViewModel(device));
+                    if(IsScanPairAndConnectEnabled)
+                    {
+                        Devices.Add(new DeviceListItemViewModel(device));
+                    }
                 }
             });
         }
@@ -2406,6 +2411,25 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
 
                 ShimmerDeviceBluetoothState previousState = CurrentState;
                 CurrentState = VerisenseBLEDevice.GetVerisenseBLEState();
+
+                if (previousState.Equals(ShimmerDeviceBluetoothState.Connecting)
+                && CurrentState.Equals(ShimmerDeviceBluetoothState.Connected))
+                {
+                    IsScanPairAndConnectEnabled = false;
+                    foreach (DeviceListItemViewModel device in Devices)
+                    {
+                        ListOfScannedDevicesTemp.Add(device);
+                    }
+                    Devices.Clear();
+                    foreach (DeviceListItemViewModel device in ListOfScannedDevicesTemp)
+                    {
+                        if (device.Id.Equals(VerisenseBLEDevice.Asm_uuid) && Devices.IsEmpty())
+                        {
+                            Devices.Add(device);
+                        }
+                    }
+                }
+                
                 if ((previousState.Equals(ShimmerDeviceBluetoothState.StreamingLoggedData) || previousState.Equals(ShimmerDeviceBluetoothState.Streaming))
                 && CurrentState.Equals(ShimmerDeviceBluetoothState.Disconnected)) //if it went from a streaming state to disconnect, we want to remember what the previous state was so can execute it upon reconnect
                 {
@@ -2418,6 +2442,10 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
                     ReconnectTimer = new System.Threading.Timer(Reconnect, null, 5000, Timeout.Infinite);
                 }
 
+                if (VerisenseBLEDevice.GetVerisenseBLEState().Equals(ShimmerDeviceBluetoothState.Disconnected))
+                {
+                    IsScanPairAndConnectEnabled = true;
+                }
                 DisconnectPressed = false;
             }
             else if (e.CurrentEvent == VerisenseBLEEvent.SyncLoggedDataNewPayload)
@@ -3347,6 +3375,19 @@ protected set
             }
             get { return deviceState; }
         }
+        bool isScanPairAndConnectEnabled = true;
+        public bool IsScanPairAndConnectEnabled
+        {
+            protected set
+            {
+                if (isScanPairAndConnectEnabled != value)
+                {
+                    isScanPairAndConnectEnabled = value;
+                    RaisePropertyChanged();
+                }
+            }
+            get { return isScanPairAndConnectEnabled; }
+        }
         public void OnCompleted()
         {
             throw new NotImplementedException();