diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
index eceb8bf95..e474e2423 100644
--- a/src/wallet/walletutil.cpp
+++ b/src/wallet/walletutil.cpp
@@ -1,22 +1,27 @@
 // Copyright (c) 2017 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "wallet/walletutil.h"
 
 fs::path GetWalletDir() {
     fs::path path;
 
     if (gArgs.IsArgSet("-walletdir")) {
         path = fs::system_complete(gArgs.GetArg("-walletdir", ""));
         if (!fs::is_directory(path)) {
             // If the path specified doesn't exist, we return the deliberately
             // invalid empty string.
             path = "";
         }
     } else {
         path = GetDataDir();
+        // If a wallets directory exists, use that, otherwise default to
+        // GetDataDir
+        if (fs::is_directory(path / "wallets")) {
+            path /= "wallets";
+        }
     }
 
     return path;
 }