diff --git a/webapp/channels/src/sass/responsive/_tablet.scss b/webapp/channels/src/sass/responsive/_tablet.scss
index 1fb7f7d997..5611e1cc1b 100644
--- a/webapp/channels/src/sass/responsive/_tablet.scss
+++ b/webapp/channels/src/sass/responsive/_tablet.scss
@@ -119,16 +119,6 @@
 
 // Tablet and desktop
 @media screen and (min-width: 769px) {
-    // ensure the global header always sits on top of its immediate sibling
-    > header {
-        z-index: 2;
-
-        + * {
-            position: relative;
-            z-index: 1;
-        }
-    }
-
     .search-help-popover {
         width: 274px;
     }
diff --git a/webapp/channels/webpack.config.js b/webapp/channels/webpack.config.js
index 723bfa6b4d..d58dd72aec 100644
--- a/webapp/channels/webpack.config.js
+++ b/webapp/channels/webpack.config.js
@@ -5,12 +5,13 @@
 
 const path = require('path');
 const url = require('url');
+
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const ExternalTemplateRemotesPlugin = require('external-remotes-plugin');
-const webpack = require('webpack');
-const {ModuleFederationPlugin} = require('webpack').container;
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const webpack = require('webpack');
+const {ModuleFederationPlugin} = require('webpack').container;
 const WebpackPwaManifest = require('webpack-pwa-manifest');
 
 // const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
@@ -337,7 +338,6 @@ async function initializeModuleFederation() {
                 '@mattermost/client',
                 '@mattermost/types',
                 'luxon',
-                'prop-types',
             ], false),
 
             // Other containers will be forced to use the exact versions of shared modules that the web app provides.