diff --git a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationFavoriteProjects.js b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationFavoriteProjects.js
index 52213c4300d..e63f7a95677 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationFavoriteProjects.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationFavoriteProjects.js
@@ -21,7 +21,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
-import PageHeaderContainer from '../../projects/components/PageHeaderContainer';
 import FavoriteProjectsContainer from '../../projects/components/FavoriteProjectsContainer';
 import { getOrganizationByKey } from '../../../store/rootReducer';
 import { updateOrganization } from '../actions';
@@ -48,7 +47,6 @@ class OrganizationFavoriteProjects extends React.Component {
     return (
       <div id="projects-page" className="page page-limited">
         <Helmet title={translate('projects.page')} titleTemplate="%s - SonarQube" />
-        <PageHeaderContainer organization={this.props.organization} />
         <FavoriteProjectsContainer
           location={this.props.location}
           organization={this.props.organization}
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationProjects.js b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationProjects.js
index 7eac312780b..7bbe2a3f419 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationProjects.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationProjects.js
@@ -21,7 +21,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
-import PageHeaderContainer from '../../projects/components/PageHeaderContainer';
 import AllProjectsContainer from '../../projects/components/AllProjectsContainer';
 import { getOrganizationByKey } from '../../../store/rootReducer';
 import { updateOrganization } from '../actions';
@@ -48,7 +47,6 @@ class OrganizationProjects extends React.Component {
     return (
       <div id="projects-page" className="page page-limited">
         <Helmet title={translate('projects.page')} titleTemplate="%s - SonarQube" />
-        <PageHeaderContainer organization={this.props.organization} />
         <AllProjectsContainer
           isFavorite={false}
           location={this.props.location}
diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
index f1b7730649a..77061055d28 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
+++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.js
@@ -59,10 +59,12 @@ export default class AllProjects extends React.Component {
   render() {
     const isFiltered = Object.keys(this.state.query).some(key => this.state.query[key] != null);
 
+    const top = this.props.organization ? 95 : 30;
+
     return (
       <div className="page-with-sidebar page-with-left-sidebar projects-page">
         <aside className="page-sidebar-fixed page-sidebar-sticky projects-sidebar">
-          <div className="page-sidebar-sticky-inner">
+          <div className="page-sidebar-sticky-inner" style={{ top }}>
             <PageSidebar
               query={this.state.query}
               isFavorite={this.props.isFavorite}
diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
index cd030e5d45d..bbae07c9429 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
+++ b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
@@ -49,7 +49,7 @@ export default class PageSidebar extends React.PureComponent {
 
     return (
       <div className="search-navigator-facets-list">
-        <FavoriteFilterContainer />
+        <FavoriteFilterContainer organization={this.props.organization} />
 
         <div className="projects-facets-header clearfix">
           {isFiltered &&