diff --git a/src/components/modals/main/settings/sections/Order.jsx b/src/components/modals/main/settings/sections/Order.jsx
index b4496ae1..d375c5db 100644
--- a/src/components/modals/main/settings/sections/Order.jsx
+++ b/src/components/modals/main/settings/sections/Order.jsx
@@ -83,7 +83,7 @@ export default class OrderSettings extends React.PureComponent {
 
   componentDidUpdate() {
     localStorage.setItem('order', JSON.stringify(this.state.items));
-    EventBus.dispatch('refresh', 'order');
+    EventBus.dispatch('refresh', 'widgets');
   }
 
   render() {
diff --git a/src/components/modals/main/settings/sections/Search.jsx b/src/components/modals/main/settings/sections/Search.jsx
index f933064d..881c2fa7 100644
--- a/src/components/modals/main/settings/sections/Search.jsx
+++ b/src/components/modals/main/settings/sections/Search.jsx
@@ -74,7 +74,7 @@ export default class SearchSettings extends React.PureComponent {
     return (
       <>
         <h2>{search.title}</h2>
-        <Switch name='searchBar' text={language.enabled} category='search' />
+        <Switch name='searchBar' text={language.enabled} category='widgets' />
         {isChrome ? <Checkbox name='voiceSearch' text={search.voice_search} /> : null}
 
         <Dropdown label={search.search_engine} name='searchEngine' onChange={(value) => this.setSearchEngine(value)}>
diff --git a/src/components/modals/main/settings/sections/Weather.jsx b/src/components/modals/main/settings/sections/Weather.jsx
index 9d6348b1..9b8833a3 100644
--- a/src/components/modals/main/settings/sections/Weather.jsx
+++ b/src/components/modals/main/settings/sections/Weather.jsx
@@ -38,7 +38,7 @@ export default class TimeSettings extends React.PureComponent {
     return (
       <>
         <h2>{language.title}</h2>
-        <Switch name='weatherEnabled' text={this.language.enabled} category='weather'/>
+        <Switch name='weatherEnabled' text={this.language.enabled} category='widgets'/>
         <ul>
           <p>{language.location}</p>
           <input type='text' value={this.state.location} onChange={(e) => this.setState({ location: e.target.value })}></input>
diff --git a/src/components/widgets/Widgets.jsx b/src/components/widgets/Widgets.jsx
index 09dc42b2..47dea04c 100644
--- a/src/components/widgets/Widgets.jsx
+++ b/src/components/widgets/Widgets.jsx
@@ -34,7 +34,7 @@ export default class Widgets extends React.PureComponent {
 
   componentDidMount() {
     EventBus.on('refresh', (data) => {
-      if (data === 'order') {
+      if (data === 'widgets') {
         this.setState({
           order: JSON.parse(localStorage.getItem('order'))
         });
diff --git a/src/components/widgets/search/Search.jsx b/src/components/widgets/search/Search.jsx
index 6c9c0b3b..30f0fbeb 100644
--- a/src/components/widgets/search/Search.jsx
+++ b/src/components/widgets/search/Search.jsx
@@ -75,13 +75,6 @@ export default class Search extends React.PureComponent {
   componentDidMount() {
     EventBus.on('refresh', (data) => {
       if (data === 'search') {
-        const element = document.querySelector('.searchBar');
-
-        if (localStorage.getItem('searchBar') === 'false') {
-          return element.style.display = 'none';
-        }
-
-        element.style.display = 'block';
         this.init();
       }
     });
diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx
index b12e3c77..8a98f5ad 100644
--- a/src/components/widgets/weather/Weather.jsx
+++ b/src/components/widgets/weather/Weather.jsx
@@ -89,13 +89,6 @@ export default class Weather extends React.PureComponent {
   componentDidMount() {
     EventBus.on('refresh', (data) => {
       if (data === 'weather') {
-        const element = document.querySelector('.weather');
-
-        if (localStorage.getItem('weatherEnabled') === 'false') {
-          return element.style.display = 'none';
-        }
-
-        element.style.display = 'block';
         this.getWeather();
       }
     });
@@ -103,6 +96,10 @@ export default class Weather extends React.PureComponent {
     this.getWeather();
   }
 
+  componentWillUnmount() {
+    EventBus.remove('refresh');
+  }
+
   render() {
     const enabled = (setting) => {
       return (localStorage.getItem(setting) === 'true');