diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp
index 22a40bb..d0e2f0e 100644
--- a/src/balancestablemodel.cpp
+++ b/src/balancestablemodel.cpp
@@ -20,24 +20,29 @@ void BalancesTableModel::setNewData(const QList<QString> zaddrs, const QList<QSt
     // This is a QList deep copy.
     *unspentOutputs = outputs;
 
+    // Are there any z or t addresses with balance in the balances table?
+    bool anyz = false;
+    bool anyt = false;
+
     // Process the address balances into a list
     delete modeldata;
     modeldata = new QList<std::tuple<QString, CAmount>>();
-    std::for_each(balances.keyBegin(), balances.keyEnd(), [=] (auto keyIt) {
+    std::for_each(balances.keyBegin(), balances.keyEnd(), [=, &anyz, &anyt] (auto keyIt) {
         modeldata->push_back(std::make_tuple(keyIt, balances.value(keyIt)));
+         if (Settings::isZAddress(keyIt)) {
+            anyz = true;
+        } else if (Settings::isTAddress(keyIt)) {
+            anyt = true;
+        }
     });
 
-    // Add all addresses that have no balances as well
-    for (auto zaddr: zaddrs) {
-        if (!balances.contains(zaddr)) {
-            modeldata->push_back(std::make_tuple(zaddr, CAmount::fromqint64(0)));
-        }
+    // Add all addresses that have no balances, if there are no existing addresses
+    if (!anyz && zaddrs.length() > 0) {
+        modeldata->push_back(std::make_tuple(zaddrs[0], CAmount::fromqint64(0)));
     }
 
-    for (auto taddr: taddrs) {
-        if (!balances.contains(taddr)) {
-            modeldata->push_back(std::make_tuple(taddr, CAmount::fromqint64(0)));
-        }
+   if (!anyt && taddrs.length() > 0) {
+        modeldata->push_back(std::make_tuple(taddrs[0], CAmount::fromqint64(0)));
     }
 
     // And then update the data
diff --git a/src/camount.h b/src/camount.h
index b5d88b9..2063903 100644
--- a/src/camount.h
+++ b/src/camount.h
@@ -71,6 +71,9 @@ public:
     bool operator> (const CAmount& other) const {
         return this->amount > other.amount;
     }
+    bool operator== (const qint64 other) const {
+        return this->amount == other;
+    }
 };
 
 #endif // CAMOUNT_H
diff --git a/src/controller.cpp b/src/controller.cpp
index d181cab..f6eac3b 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -353,6 +353,9 @@ void Controller::updateUIBalances() {
 
     CAmount balTotal     = balT + balZ;
     CAmount balAvailable = balT + balVerified;
+    if (balZ < 0) {
+        balZ = CAmount::fromqint64(0);
+    }
 
     // Balances table
     ui->balSheilded   ->setText(balZ.toDecimalhushString());
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6ae47eb..2680923 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1048,8 +1048,7 @@ void MainWindow::setupReceiveTab() {
             updateTAddrCombo(checked);
         } 
 
-        // Toggle the "View all addresses" button as well
-        ui->btnViewAllAddresses->setVisible(checked);
+
     });
 
     // View all addresses goes to "View all private keys"
@@ -1065,7 +1064,14 @@ void MainWindow::setupReceiveTab() {
         Settings::saveRestoreTableHeader(viewaddrs.tblAddresses, &d, "viewalladdressestable");
         viewaddrs.tblAddresses->horizontalHeader()->setStretchLastSection(true);
 
-        ViewAllAddressesModel model(viewaddrs.tblAddresses, getRPC()->getModel()->getAllTAddresses(), getRPC());
+         QList<QString> allAddresses;
+        if (ui->rdioTAddr->isChecked()) {
+            allAddresses = getRPC()->getModel()->getAllTAddresses();
+        } else {
+            allAddresses = getRPC()->getModel()->getAllZAddresses();
+        }
+
+        ViewAllAddressesModel model(viewaddrs.tblAddresses, allAddresses, getRPC());
         viewaddrs.tblAddresses->setModel(&model);
 
         QObject::connect(viewaddrs.btnExportAll, &QPushButton::clicked,  this, &MainWindow::exportAllKeys);
@@ -1100,6 +1106,20 @@ void MainWindow::setupReceiveTab() {
     QObject::connect(ui->btnReceiveNewAddr, &QPushButton::clicked, [=] () {
         if (!rpc->getConnection())
             return;
+        
+                // Go over the dropdown and just select the next address that has:
+        // 0 balance and has no labels
+        for (int i=ui->listReceiveAddresses->currentIndex()+1; i < ui->listReceiveAddresses->count(); i++) {
+            QString item = ui->listReceiveAddresses->itemText(i);
+            CAmount bal = getRPC()->getModel()->getAllBalances().value(item, CAmount());
+            if (bal == 0 && AddressBook::getInstance()->getLabelForAddress(item).isEmpty()) {
+                // Pick this one, since it has no balance and no label
+                ui->listReceiveAddresses->setCurrentIndex(i);
+                return;
+            }
+        }
+
+        // If none of the existing items were eligible, create a new one.
 
         if (ui->rdioZSAddr->isChecked()) {
             addNewZaddr(true);
@@ -1113,7 +1133,7 @@ void MainWindow::setupReceiveTab() {
         if (tab == 2) {
             // Switched to receive tab, select the z-addr radio button
             ui->rdioZSAddr->setChecked(true);
-            ui->btnViewAllAddresses->setVisible(false);
+            
             
             // And then select the first one
             ui->listReceiveAddresses->setCurrentIndex(0);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index a8d0998..87a5a78 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -770,7 +770,7 @@
                <item>
                 <widget class="QPushButton" name="btnReceiveNewAddr">
                  <property name="text">
-                  <string>New Address</string>
+                  <string>Next Address</string>
                  </property>
                 </widget>
                </item>