diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php
index cf0a1c7b0..892d2fd94 100644
--- a/lib/Doctrine/Manager.php
+++ b/lib/Doctrine/Manager.php
@@ -287,6 +287,9 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
         if ($name !== null) {
             $name = (string) $name;
             if (isset($this->_connections[$name])) {
+                if ($setCurrent) {
+                    $this->_currIndex = $name;
+                }
                 return $this->_connections[$name];
             }
         } else {