fix(Sidebar): Fix sidebar tab sorting (@josescgar)

Closes #283

2 files changed, 7 insertions, 2 deletions

diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index fd4325107..9da1090b7 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -30,6 +30,8 @@ export default class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
+
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
 
@@ -71,6 +73,7 @@ export default class TabBar extends Component {
           setActive={setActive}
           onSortEnd={this.onSortEnd}
           onSortStart={disableToolTip}
+          shouldCancelStart={this.shouldPreventSorting}
           reload={reload}
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 9af5d81da..22c376c06 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -470,8 +470,10 @@ export default class ServicesStore extends Store {
     const service = this.active;
 
     if (service) {
-      this.stores.settings.updateSettingsRequest.execute({
-        activeService: service.id,
+      this.actions.settings.update({
+        settings: {
+          activeService: service.id,
+        },
       });
     }
   }