diff --git a/packages/shared/components/Sidebar.svelte b/packages/shared/components/Sidebar.svelte
index 294c6443032..d2ff4c562b9 100644
--- a/packages/shared/components/Sidebar.svelte
+++ b/packages/shared/components/Sidebar.svelte
@@ -46,7 +46,7 @@
 </script>
 
 <aside
-    class="flex flex-col justify-center items-center bg-white dark:bg-gray-800 h-screen relative w-20 px-5 pb-9 pt-9 border-solid border-r border-gray-100 dark:border-gray-800">
+    class="flex flex-col justify-center items-center bg-white dark:bg-gray-800 h-full relative w-20 px-5 pb-9 pt-9 border-solid border-r border-gray-100 dark:border-gray-800">
     <Logo classes="mb-10" width="48px" logo="logo-firefly" />
     <nav class="flex flex-grow flex-col items-center justify-between pt-4">
         <button class={$dashboardRoute === Tabs.Wallet ? 'text-blue-500' : 'text-gray-500'} on:click={() => openWallet()}>
diff --git a/packages/shared/components/TitleBar.svelte b/packages/shared/components/TitleBar.svelte
index 617787e7ac3..5647fd54777 100644
--- a/packages/shared/components/TitleBar.svelte
+++ b/packages/shared/components/TitleBar.svelte
@@ -6,6 +6,7 @@
 
     onMount(async () => {
         os = await Electron.getOS()
+        document.body.classList.add(`platform-${os}`)
     })
 </script>
 
@@ -43,5 +44,7 @@
     {#if os === 'darwin'}
         <div style="-webkit-app-region: drag" class="w-full h-8 fixed left-20" />
     {/if}
-    <slot />
+    <div class={`fixed ${os === 'win32' ? 'top-10' : 'top-0'} left-0 right-0 bottom-0`}>
+        <slot />
+    </div>
 </div>
diff --git a/packages/shared/components/popups/Index.svelte b/packages/shared/components/popups/Index.svelte
index a329a0db4c8..2dbbac4498b 100644
--- a/packages/shared/components/popups/Index.svelte
+++ b/packages/shared/components/popups/Index.svelte
@@ -65,7 +65,7 @@
 <popup
     in:fade={{ duration: transition ? 100 : 0 }}
     class={`flex items-center justify-center fixed top-0 left-0 w-screen p-6
-                h-screen overflow-hidden z-10 ${fullScreen ? 'bg-white dark:bg-gray-900' : 'bg-gray-800 bg-opacity-40'}`}>
+                h-full overflow-hidden z-10 ${fullScreen ? 'bg-white dark:bg-gray-900' : 'bg-gray-800 bg-opacity-40'}`}>
     <popup-content
         class={`bg-white rounded-xl pt-6 px-8 pb-8 relative ${fullScreen ? 'full-screen dark:bg-gray-900' : 'dark:bg-gray-900'}`}>
         {#if !hideClose}
diff --git a/packages/shared/routes/dashboard/wallet/Wallet.svelte b/packages/shared/routes/dashboard/wallet/Wallet.svelte
index f0f6695f226..104d7ffc46d 100644
--- a/packages/shared/routes/dashboard/wallet/Wallet.svelte
+++ b/packages/shared/routes/dashboard/wallet/Wallet.svelte
@@ -372,6 +372,12 @@
     })
 </script>
 
+<style type="text/scss">
+    :global(body.platform-win32) .wallet-wrapper {
+        @apply pt-0;
+    }
+</style>
+
 {#if $walletRoute === WalletRoutes.Account && $selectedAccountId}
     <Account
         {isGeneratingAddress}
@@ -380,7 +386,7 @@
         generateAddress={onGenerateAddress}
         {locale} />
 {:else}
-    <div class="w-full h-full flex flex-col p-10 flex-1 bg-gray-50 dark:bg-gray-900">
+    <div class="wallet-wrapper w-full h-full flex flex-col p-10 flex-1 bg-gray-50 dark:bg-gray-900">
         <div class="w-full h-full flex flex-row space-x-4 flex-auto">
             <DashboardPane classes="w-1/3 h-full">
                 <!-- Total Balance, Accounts list & Send/Receive -->
diff --git a/packages/shared/routes/login/views/SelectProfile.svelte b/packages/shared/routes/login/views/SelectProfile.svelte
index 282bc349681..2b4f9c13ab0 100644
--- a/packages/shared/routes/login/views/SelectProfile.svelte
+++ b/packages/shared/routes/login/views/SelectProfile.svelte
@@ -21,7 +21,7 @@
 {#if mobile}
     <div>Not yet implemented</div>
 {:else}
-    <section class="flex flex-col h-screen bg-white dark:bg-gray-900 items-center">
+    <section class="flex flex-col h-full bg-white dark:bg-gray-900 items-center">
         <Logo width="64px" logo="logo-firefly" classes="absolute top-20 transform left-1/2 -translate-x-1/2" />
         <div class="h-full space-x-20 flex flex-wrap justify-center items-start content-center mt-10 mx-20">
             {#each $profiles as profile}