diff --git a/lib/pages_desktop_specific/home/my_stack_view/my_wallets.dart b/lib/pages_desktop_specific/home/my_stack_view/my_wallets.dart
index 13170d07e..550db293e 100644
--- a/lib/pages_desktop_specific/home/my_stack_view/my_wallets.dart
+++ b/lib/pages_desktop_specific/home/my_stack_view/my_wallets.dart
@@ -53,10 +53,7 @@ class _MyWalletsState extends ConsumerState<MyWallets> {
             height: 20,
           ),
           const Expanded(
-            child: MouseRegion(
-              cursor: SystemMouseCursors.click,
-              child: WalletSummaryTable(),
-            ),
+            child: WalletSummaryTable(),
           ),
         ],
       ),
diff --git a/lib/widgets/expandable.dart b/lib/widgets/expandable.dart
index a0c2be5a4..47726d6d6 100644
--- a/lib/widgets/expandable.dart
+++ b/lib/widgets/expandable.dart
@@ -89,11 +89,14 @@ class _ExpandableState extends State<Expandable> with TickerProviderStateMixin {
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
-        GestureDetector(
-          onTap: toggle,
-          child: Container(
-            color: Colors.transparent,
-            child: widget.header,
+        MouseRegion(
+          cursor: SystemMouseCursors.click,
+          child: GestureDetector(
+            onTap: toggle,
+            child: Container(
+              color: Colors.transparent,
+              child: widget.header,
+            ),
           ),
         ),
         SizeTransition(
diff --git a/lib/widgets/table_view/table_view.dart b/lib/widgets/table_view/table_view.dart
index 7e8693f0d..8c2d470bd 100644
--- a/lib/widgets/table_view/table_view.dart
+++ b/lib/widgets/table_view/table_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:stackwallet/widgets/table_view/table_view_row.dart';
 
 class TableView extends StatefulWidget {
   const TableView({
@@ -9,7 +8,7 @@ class TableView extends StatefulWidget {
     this.shrinkWrap = false,
   }) : super(key: key);
 
-  final List<TableViewRow> rows;
+  final List<Widget> rows;
   final double rowSpacing;
   final bool shrinkWrap;
 
diff --git a/lib/widgets/wallet_info_row/wallet_info_row.dart b/lib/widgets/wallet_info_row/wallet_info_row.dart
index d5e42e814..fe006a67b 100644
--- a/lib/widgets/wallet_info_row/wallet_info_row.dart
+++ b/lib/widgets/wallet_info_row/wallet_info_row.dart
@@ -26,53 +26,58 @@ class WalletInfoRow extends ConsumerWidget {
         .getManagerProvider(walletId));
 
     if (Util.isDesktop) {
-      return GestureDetector(
-        onTap: onPressed,
-        child: Container(
-          color: Colors.transparent,
-          child: Row(
-            children: [
-              Expanded(
-                flex: 4,
-                child: Row(
-                  children: [
-                    WalletInfoCoinIcon(coin: manager.coin),
-                    const SizedBox(
-                      width: 12,
-                    ),
-                    Text(
-                      manager.walletName,
-                      style: STextStyles.desktopTextExtraSmall(context).copyWith(
-                        color:
-                            Theme.of(context).extension<StackColors>()!.textDark,
+      return MouseRegion(
+        cursor: SystemMouseCursors.click,
+        child: GestureDetector(
+          onTap: onPressed,
+          child: Container(
+            color: Colors.transparent,
+            child: Row(
+              children: [
+                Expanded(
+                  flex: 4,
+                  child: Row(
+                    children: [
+                      WalletInfoCoinIcon(coin: manager.coin),
+                      const SizedBox(
+                        width: 12,
                       ),
-                    ),
-                  ],
+                      Text(
+                        manager.walletName,
+                        style:
+                            STextStyles.desktopTextExtraSmall(context).copyWith(
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textDark,
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-              Expanded(
-                flex: 4,
-                child: WalletInfoRowBalanceFuture(
-                  walletId: walletId,
+                Expanded(
+                  flex: 4,
+                  child: WalletInfoRowBalanceFuture(
+                    walletId: walletId,
+                  ),
                 ),
-              ),
-              Expanded(
-                flex: 6,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: [
-                    SvgPicture.asset(
-                      Assets.svg.chevronRight,
-                      width: 20,
-                      height: 20,
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .textSubtitle1,
-                    )
-                  ],
-                ),
-              )
-            ],
+                Expanded(
+                  flex: 6,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      SvgPicture.asset(
+                        Assets.svg.chevronRight,
+                        width: 20,
+                        height: 20,
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textSubtitle1,
+                      )
+                    ],
+                  ),
+                )
+              ],
+            ),
           ),
         ),
       );