diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java
index c972579210fd..f891b3334a74 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPress.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java
@@ -390,14 +390,6 @@ public static Blog getCurrentBlog() {
         return currentBlog;
     }
 
-    public static Blog getCurrentBlogEvenIfNotVisible() {
-        if (currentBlog == null) {
-            attemptToRestoreLastActiveBlog();
-        }
-
-        return currentBlog;
-    }
-
     /**
      * Get the blog with the specified ID.
      *
@@ -439,11 +431,17 @@ public static Blog setCurrentBlogToLastActive() {
      * Set the blog with the specified id as the current blog.
      *
      * @param id id of the blog to set as current
-     * @return the current blog
      */
-    public static Blog setCurrentBlog(int id) {
-        currentBlog = wpDB.instantiateBlogByLocalId(id);
-        return currentBlog;
+    public static void setCurrentBlog(int id) {
+        currentBlog = getBlog(id);
+    }
+
+    public static void setCurrentBlogAndSetVisible(int id) {
+        setCurrentBlog(id);
+
+        if (currentBlog != null && currentBlog.isHidden()) {
+            wpDB.setDotComBlogsVisibility(id, true);
+        }
     }
 
     /**
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
index 7a526bbf06cb..b02b461d0f66 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
@@ -205,7 +205,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.SITE_PICKER:
                 // RESULT_OK = site picker changed the current blog
                 if (resultCode == Activity.RESULT_OK) {
-                    setBlog(WordPress.getCurrentBlogEvenIfNotVisible());
+                    setBlog(WordPress.getCurrentBlog());
                 }
                 // redisplay the hidden fab after a short delay
                 long delayMs = getResources().getInteger(android.R.integer.config_shortAnimTime);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
index 7bc1e9a151b0..525762fd9799 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
@@ -307,7 +307,7 @@ public void onSiteClick(SiteRecord site) {
         if (mActionMode == null) {
             mSearchView.hideSoftKeyboard();
             AniUtils.showFab(mFabView, false);
-            WordPress.setCurrentBlog(site.localId);
+            WordPress.setCurrentBlogAndSetVisible(site.localId);
             WordPress.wpDB.updateLastBlogId(site.localId);
             setResult(RESULT_OK);
             mDidUserSelectSite = true;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java
index 2fc973b3b922..53316f6a9d1b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java
@@ -35,21 +35,10 @@ public void searchSites(String searchText) {
 
     @Override
     public void loadSites() {
-        loadSites("");
-    }
-
-    public void loadSites(String search) {
-        if (search == null) {
-            search = "";
-        }
-
         if (mIsSearchTaskRunning) {
             AppLog.w(AppLog.T.UTILS, "site picker > already loading sites");
         } else {
-            if (search == null) {
-                search = "";
-            }
-            new LoadSearchSitesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, search);
+            new LoadSearchSitesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
     }
 
@@ -71,7 +60,8 @@ private SiteList filteredSitesByText(SiteList sites, String searchText) {
     }
 
     private boolean mIsSearchTaskRunning;
-    private class LoadSearchSitesTask extends AsyncTask<String, Void, SiteList> {
+
+    private class LoadSearchSitesTask extends AsyncTask<Void, Void, SiteList> {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
@@ -85,8 +75,7 @@ protected void onCancelled() {
         }
 
         @Override
-        protected SiteList doInBackground(String... params) {
-            String searchText = params[0];
+        protected SiteList doInBackground(Void... params) {
             List<Map<String, Object>> blogs = WordPress.wpDB.getAllBlogs();
 
             SiteList sites = new SiteList(blogs);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java
index 9e514f8d24c0..f4ea0405c1bd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java
@@ -44,7 +44,7 @@ public void configure(SitePickerActivity sitePickerActivity, Menu menu) {
         MenuItemCompat.setOnActionExpandListener(menuSearch, new MenuItemCompat.OnActionExpandListener() {
             @Override
             public boolean onMenuItemActionExpand(MenuItem item) {
-                enableSearchMode(mSitePickerActivity.getLastSearch());
+                enableSearchMode();
                 return true;
             }
 
@@ -61,12 +61,12 @@ public boolean onMenuItemActionCollapse(MenuItem item) {
         }
     }
 
-    public void enableSearchMode(String string) {
+    public void enableSearchMode() {
         mMenuEdit.setVisible(false);
         mSitePickerActivity.setIsInSearchModeAndNullifyAdapter(true);
         SitePickerSearchAdapter adapter = (SitePickerSearchAdapter) mSitePickerActivity.getAdapter();
         mSitePickerActivity.getRecycleView().swapAdapter(adapter, true);
-        adapter.loadSites(string);
+        adapter.loadSites();
     }
 
     public void disableSearchMode() {