diff --git a/x-pack/plugins/security_solution/public/app/home/index.tsx b/x-pack/plugins/security_solution/public/app/home/index.tsx
index f230566fa08e6..7c287646ba7ac 100644
--- a/x-pack/plugins/security_solution/public/app/home/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/index.tsx
@@ -27,7 +27,6 @@ const SecuritySolutionAppWrapper = styled.div`
 SecuritySolutionAppWrapper.displayName = 'SecuritySolutionAppWrapper';
 
 const Main = styled.main`
-  position: relative;
   overflow: auto;
   flex: 1;
 `;
diff --git a/x-pack/plugins/security_solution/public/common/components/page/index.tsx b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
index 6c49ce7453ce9..140429dc4abd7 100644
--- a/x-pack/plugins/security_solution/public/common/components/page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
@@ -73,6 +73,7 @@ export const AppGlobalStyle = createGlobalStyle<{ theme: { eui: { euiColorPrimar
 
   #kibana-body {
     height: 100%;
+    overflow-y: hidden;
 
     > .content {
       height: 100%;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
index 1ffa626b01311..ec02124ae43d3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
@@ -100,7 +100,7 @@ export const useTimelineTypes = ({
     (tabId, tabStyle: TimelineTabsStyle) => {
       setTimelineTypes((prevTimelineTypes) => {
         if (tabId === prevTimelineTypes && tabStyle === TimelineTabsStyle.filter) {
-          return null;
+          return tabId === TimelineType.default ? TimelineType.template : TimelineType.default;
         } else if (prevTimelineTypes !== tabId) {
           setTimelineTypes(tabId);
         }