diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
index 047d4d4dc2..8c01f6841c 100644
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
+++ b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
@@ -119,7 +119,7 @@ AzAssetBrowserWindow::AzAssetBrowserWindow(QWidget* parent)
     m_ui->m_assetBrowserTableViewWidget->SetName("AssetBrowserTableView_main");
 
     connect(m_filterModel.data(), &AssetBrowserFilterModel::stringFilterPopulated, this, &AzAssetBrowserWindow::SwitchDisplayView);
-    connect(m_ui->m_viewSwitcherCheckBox, &QCheckBox::stateChanged, this, &AzAssetBrowserWindow::SwitchDisplayView);
+    connect(m_ui->m_viewSwitcherCheckBox, &QCheckBox::stateChanged, this, &AzAssetBrowserWindow::LockToDefaultView);
 }
 
 AzAssetBrowserWindow::~AzAssetBrowserWindow()
@@ -290,4 +290,15 @@ void AzAssetBrowserWindow::SwitchDisplayView(bool state)
     m_ui->m_assetBrowserTreeViewWidget->setVisible(!state);
 }
 
+void AzAssetBrowserWindow::LockToDefaultView(bool state)
+{
+    using namespace AzToolsFramework;
+    using namespace AzToolsFramework::AssetBrowser;
+    SwitchDisplayView(!state);
+    if (state == true)
+        disconnect(m_filterModel.data(), &AssetBrowserFilterModel::stringFilterPopulated, this, &AzAssetBrowserWindow::SwitchDisplayView);
+    else
+        connect(m_filterModel.data(), &AssetBrowserFilterModel::stringFilterPopulated, this, &AzAssetBrowserWindow::SwitchDisplayView);
+}
+
 #include <AzAssetBrowser/moc_AzAssetBrowserWindow.cpp>
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
index 8c32a913ba..1174335995 100644
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
+++ b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
@@ -65,6 +65,7 @@ private Q_SLOTS:
     void DoubleClickedItem(const QModelIndex& element);
     void DoubleClickedItemTableModel(const QModelIndex& element);
     void SwitchDisplayView(bool state);
+    void LockToDefaultView(bool state);
 };
 
 extern const char* AZ_ASSET_BROWSER_PREVIEW_NAME;