diff --git a/airgun/views/modulestream.py b/airgun/views/modulestream.py
index 464b827b0..604eedde4 100644
--- a/airgun/views/modulestream.py
+++ b/airgun/views/modulestream.py
@@ -13,7 +13,7 @@
 class ModuleStreamView(BaseLoggedInView, SearchableViewMixinPF4):
     """Main Module_Streams view"""
 
-    title = Text("//h2[contains(., 'Module Streams')]")
+    title = Text("//h1[contains(., 'Module Streams')]")
     table = SatTable('.//table', column_widgets={'Name': Text("./a")})
 
     @property
@@ -25,7 +25,7 @@ def is_displayed(self):
 class ModuleStreamsDetailsView(BaseLoggedInView):
     breadcrumb = BreadCrumb()
 
-    title = Text("//a(., 'Module Streams')]")
+    title = Text(".//a[(@href='/module_streams/') and contains(.,'Module Streams')]")
     details_tab = Text("//a[@id='module-stream-tabs-container-tab-1']")
 
     @property