diff --git a/assets/styles/tablesort.css b/assets/styles/tablesort.css
index 5108762..ecc5dfc 100644
--- a/assets/styles/tablesort.css
+++ b/assets/styles/tablesort.css
@@ -31,3 +31,7 @@ th[role=columnheader]:not(.no-sort):hover:after {
 	visibility: visible;
 	opacity: 1;
 }
+
+.noSortCollumn[role=columnheader]:not(.no-sort):after {
+	display: none;
+}
diff --git a/assets/templates/addressBook.html b/assets/templates/addressBook.html
index b67f9d7..224bb16 100644
--- a/assets/templates/addressBook.html
+++ b/assets/templates/addressBook.html
@@ -8,10 +8,10 @@
     <table class="bordered" id="addressTable">
       <thead>
         <tr>
-          <th scope="col" data-sort-method='none'></th>
+          <th scope="col" class="noSortCollumn" data-sort-method='none'></th>
           <th scope="col">Name</th>
           <th scope="col">Address</th>
-          <th scope="col" data-sort-method='none'>Actions</th>
+          <th scope="col" class="noSortCollumn" data-sort-method='none'>Actions</th>
         </tr>
       </thead>
       <tbody>
diff --git a/assets/templates/wallets.html b/assets/templates/wallets.html
index f0e9fe9..d52608e 100644
--- a/assets/templates/wallets.html
+++ b/assets/templates/wallets.html
@@ -24,10 +24,10 @@
     <table class="bordered" id="addressTable">
       <thead>
         <tr>
-          <th scope="col" data-sort-method='none'></th>
+          <th scope="col" class="noSortCollumn" data-sort-method='none'></th>
           <th scope="col">Name</th>
           <th scope="col">Address</th>
-          <th scope="col" data-sort-method='none'></th>
+          <th scope="col" class="noSortCollumn" data-sort-method='none'></th>
           <th scope="col" data-sort-method='number'>Balance</th>
         </tr>
       </thead>
diff --git a/renderer/addressBook.js b/renderer/addressBook.js
index 9c19b4b..39e3e52 100644
--- a/renderer/addressBook.js
+++ b/renderer/addressBook.js
@@ -54,8 +54,10 @@ class AddressBook {
 
 // the event to tell us that the wallets are rendered
 $(document).on("render_addressBook", function () {
-  new Tablesort(document.getElementById("addressTable"));
-  $("#addressTable").floatThead();
+  if ($("#addressTable").length > 0) {
+    new Tablesort(document.getElementById("addressTable"));
+    $("#addressTable").floatThead();
+  }
 
   $("#btnNewAddress").off("click").on("click", function () {
     $("#dlgCreateAddressAndName").iziModal();
diff --git a/renderer/wallets.js b/renderer/wallets.js
index 8c48d87..21411e2 100644
--- a/renderer/wallets.js
+++ b/renderer/wallets.js
@@ -96,8 +96,10 @@ class Wallets {
 
 // the event to tell us that the wallets are rendered
 $(document).on("render_wallets", function () {
-  new Tablesort(document.getElementById("addressTable"));
-  $("#addressTable").floatThead();
+  if ($("#addressTable").length > 0) {
+    new Tablesort(document.getElementById("addressTable"));
+    $("#addressTable").floatThead();
+  }
 
   $("#btnNewAddress").off("click").on("click", function () {
     $("#dlgCreateWalletPassword").iziModal();