diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e6ef0e4..7a12921 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1295,15 +1295,19 @@ void MainWindow::setupReceiveTab() {
 
     // Connect t-addr radio button
     QObject::connect(ui->rdioTAddr, &QRadioButton::toggled, [=] (bool checked) { 
-        // DEPRECATED
         // Whenever the t-address is selected, we generate a new address, because we don't
         // want to reuse t-addrs
         if (checked && this->rpc->getUTXOs() != nullptr) { 
             updateTAddrCombo(checked);
-            //addNewTAddr();
         } 
+
+        // Toggle the "View all addresses" button as well
+        ui->btnViewAllAddresses->setVisible(checked);
     });
 
+    // View all addresses goes to "View all private keys"
+    QObject::connect(ui->btnViewAllAddresses, &QPushButton::clicked, this, &MainWindow::exportAllKeys);
+
     QObject::connect(ui->rdioZSAddr, &QRadioButton::toggled, addZAddrsToComboList(true));
 
     // Explicitly get new address button.
@@ -1323,6 +1327,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 fc39870..aa9599a 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -360,7 +360,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>920</width>
-                <height>324</height>
+                <height>301</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="sendToLayout">
@@ -734,6 +734,13 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QPushButton" name="btnViewAllAddresses">
+                 <property name="text">
+                  <string>View All Addresses</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
             </layout>
@@ -1045,7 +1052,7 @@
      <x>0</x>
      <y>0</y>
      <width>968</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/src/privkey.ui b/src/privkey.ui
index 9fe3760..57bdb16 100644
--- a/src/privkey.ui
+++ b/src/privkey.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Private Key</string>
+   <string>Private Keys</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">