diff --git a/rai/qt/qt.cpp b/rai/qt/qt.cpp
index 2918fdba..b89cbb7a 100644
--- a/rai/qt/qt.cpp
+++ b/rai/qt/qt.cpp
@@ -29,9 +29,13 @@ client_layout (new QVBoxLayout),
 balance_label (new QLabel),
 entry_window (new QWidget),
 entry_window_layout (new QVBoxLayout),
+wallet_model (new QStandardItemModel),
+wallet_view (new QTableView),
 send_blocks (new QPushButton ("Send")),
+wallet_add_account (new QPushButton ("Create account")),
 settings (new QPushButton ("Settings")),
 show_advanced (new QPushButton ("Advanced")),
+wallet_refresh (new QPushButton ("Refresh")),
 send_blocks_window (new QWidget),
 send_blocks_layout (new QVBoxLayout),
 send_account_label (new QLabel ("Destination account:")),
@@ -39,11 +43,7 @@ send_account (new QLineEdit),
 send_count_label (new QLabel ("Amount:")),
 send_count (new QLineEdit),
 send_blocks_send (new QPushButton ("Send")),
-send_blocks_back (new QPushButton ("Back")),
-wallet_model (new QStandardItemModel),
-wallet_view (new QTableView),
-wallet_refresh (new QPushButton ("Refresh")),
-wallet_add_account (new QPushButton ("Create account"))
+send_blocks_back (new QPushButton ("Back"))
 {
     send_blocks_layout->addWidget (send_account_label);
     send_blocks_layout->addWidget (send_account);
@@ -63,11 +63,11 @@ wallet_add_account (new QPushButton ("Create account"))
     wallet_view->setContextMenuPolicy (Qt::ContextMenuPolicy::CustomContextMenu);
     
     entry_window_layout->addWidget (wallet_view);
-    entry_window_layout->addWidget (wallet_refresh);
-    entry_window_layout->addWidget (wallet_add_account);
     entry_window_layout->addWidget (send_blocks);
+    entry_window_layout->addWidget (wallet_add_account);
     entry_window_layout->addWidget (settings);
     entry_window_layout->addWidget (show_advanced);
+    entry_window_layout->addWidget (wallet_refresh);
     entry_window_layout->setContentsMargins (0, 0, 0, 0);
     entry_window_layout->setSpacing (5);
     entry_window->setLayout (entry_window_layout);
diff --git a/rai/qt/qt.hpp b/rai/qt/qt.hpp
index 968af9fa..207aef34 100644
--- a/rai/qt/qt.hpp
+++ b/rai/qt/qt.hpp
@@ -124,9 +124,14 @@ namespace rai_qt {
         
         QWidget * entry_window;
         QVBoxLayout * entry_window_layout;
+        QStandardItemModel * wallet_model;
+        QTableView * wallet_view;
         QPushButton * send_blocks;
+        QPushButton * wallet_add_account;
         QPushButton * settings;
         QPushButton * show_advanced;
+        QPushButton * wallet_refresh;
+
         
         QWidget * send_blocks_window;
         QVBoxLayout * send_blocks_layout;
@@ -137,10 +142,6 @@ namespace rai_qt {
         QPushButton * send_blocks_send;
         QPushButton * send_blocks_back;
         
-        QStandardItemModel * wallet_model;
-        QTableView * wallet_view;
-        QPushButton * wallet_refresh;
-        QPushButton * wallet_add_account;
 		
         void pop_main_stack ();
         void push_main_stack (QWidget *);