diff --git a/src/ImageSearchModal.jsx b/src/ImageSearchModal.jsx
index 749c938da..b789151b1 100644
--- a/src/ImageSearchModal.jsx
+++ b/src/ImageSearchModal.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { ListGroup, ListGroupItem, Modal } from 'patternfly-react';
-import { Button, InputGroup, InputGroupText } from '@patternfly/react-core';
-import { SearchIcon } from '@patternfly/react-icons';
+import { Button, InputGroup } from '@patternfly/react-core';
 
+import * as Select from '../lib/cockpit-components-select.jsx';
 import { ErrorNotification } from './Notification.jsx';
 import cockpit from 'cockpit';
 import rest from './rest.js';
@@ -22,6 +22,7 @@ export class ImageSearchModal extends React.Component {
             searchInProgress: false,
             searchFinished: false,
             isSystem: props.systemServiceAvailable,
+            registry: "",
         };
         this.onDownloadClicked = this.onDownloadClicked.bind(this);
         this.onItemSelected = this.onItemSelected.bind(this);
@@ -72,12 +73,16 @@ export class ImageSearchModal extends React.Component {
         this.setState({ searchInProgress: true });
 
         this.activeConnection = rest.connect(client.getAddress(this.state.isSystem), this.state.isSystem);
+
+        const rr = this.state.registry;
+        const registry = rr.length < 1 || rr[rr.length - 1] === "/" ? rr : rr + "/";
+
         const options = {
             method: "GET",
             path: "/v1.12/libpod/images/search",
             body: "",
             params: {
-                term: this.state.imageIdentifier,
+                term: registry + this.state.imageIdentifier,
             },
         };
         this.activeConnection.call(options)
@@ -136,17 +141,37 @@ export class ImageSearchModal extends React.Component {
                     </form>
                 }
                 <InputGroup>
-                    <InputGroupText id="username" aria-label={_("Search")}>
-                        <SearchIcon />
-                    </InputGroupText>
-                    <input id='search-image-dialog-name'
-                        autoFocus
-                        className='form-control'
-                        type='text'
-                        placeholder={_("Search by name or description")}
-                        value={this.state.imageIdentifier}
-                        onKeyPress={this.onKeyPress}
-                        onChange={e => this.onValueChanged('imageIdentifier', e.target.value)} />
+                    <div className="ct-form">
+                        <label htmlFor="search-image-dialog-name" className="control-label">{_("Search for")}</label>
+                        <input id='search-image-dialog-name'
+                            autoFocus
+                            className='form-control ct-form-split'
+                            type='text'
+                            placeholder={_("Search by name or description")}
+                            value={this.state.imageIdentifier}
+                            onKeyPress={this.onKeyPress}
+                            onChange={e => this.onValueChanged('imageIdentifier', e.target.value)} />
+                        <label htmlFor="registry-select" aria-label="Registry" className="control-label">{_("in")}</label>
+                        <div className="ct-form-split">
+                            <Select.Select id='registry-select'
+                                initial={this.state.registry}
+                                // Why isn't it taking on this class?!
+                                className='ct-form-split'
+                                onChange={value =>
+                                    this.setState({ registry: value }, () => this.onSearchTriggered(false))
+                                }>
+                                <Select.SelectEntry data="" key="all">
+                                    {_("All registries")}
+                                </Select.SelectEntry>
+                                {(this.props.registries.search || []).map(r => {
+                                    return <Select.SelectEntry data={r} key={r}>
+                                        {r}
+                                    </Select.SelectEntry>;
+                                })
+                                }
+                            </Select.Select>
+                        </div>
+                    </div>
                 </InputGroup>
 
                 {this.state.searchInProgress && <div id='search-image-dialog-waiting' className='spinner' />}
diff --git a/src/Images.jsx b/src/Images.jsx
index d1ba391d6..e2b0c0a1f 100644
--- a/src/Images.jsx
+++ b/src/Images.jsx
@@ -261,6 +261,7 @@ class Images extends React.Component {
                     close={() => this.setState({ showSearchImageModal: false })}
                     downloadImage={this.downloadImage}
                     user={this.props.user}
+                    registries={this.props.registries}
                     userServiceAvailable={this.props.userServiceAvailable}
                     systemServiceAvailable={this.props.systemServiceAvailable} /> }
                 {this.state.imageDownloadInProgress && <div className='download-in-progress'> {_("Pulling")} {this.state.imageDownloadInProgress}... </div>}
diff --git a/src/app.jsx b/src/app.jsx
index a92ccdfc8..bfaf1c121 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -324,7 +324,11 @@ class Application extends React.Component {
     init(system) {
         client.getInfo(system)
                 .then(reply => {
-                    this.setState({ [system ? "systemServiceAvailable" : "userServiceAvailable"]: true, version: reply.version.Version });
+                    this.setState({
+                        [system ? "systemServiceAvailable" : "userServiceAvailable"]: true,
+                        version: reply.version.Version,
+                        registries: reply.registries,
+                    });
                     this.updateImagesAfterEvent(system);
                     this.updateContainersAfterEvent(system, true);
                     client.streamEvents(system,
@@ -514,6 +518,7 @@ class Application extends React.Component {
                 user={permission.user || _("user")}
                 userServiceAvailable={this.state.userServiceAvailable}
                 systemServiceAvailable={this.state.systemServiceAvailable}
+                registries={this.state.registries}
             />;
         const containerList =
             <Containers
diff --git a/src/podman.scss b/src/podman.scss
index c9a043605..94f59296a 100644
--- a/src/podman.scss
+++ b/src/podman.scss
@@ -235,4 +235,3 @@
     padding: 0 0.5em 0 1em;
     font-weight: 400;
 }
-
diff --git a/test/check-application b/test/check-application
index be0ccf113..8db7caa57 100755
--- a/test/check-application
+++ b/test/check-application
@@ -18,10 +18,10 @@ from machine_core import ssh_connection
 
 REGISTRIES_CONF="""
 [registries.search]
-registries = ['localhost:5000']
+registries = ['localhost:5000', 'localhost:6000']
 
 [registries.insecure]
-registries = ['localhost:5000']
+registries = ['localhost:5000', 'localhost:6000']
 """
 
 def checkImage(browser, name, owner):
@@ -406,12 +406,14 @@ class TestApplication(testlib.MachineCase):
         execute = self.execute
 
         def prepare():
-            # Create and start registry container
+            # Create and start registry containers
             self.execute(True, "podman run -d -p 5000:5000 --name registry registry:2")
+            self.execute(True, "podman run -d -p 6000:5000 --name registry_alt registry:2")
             # Add local insecure registry into registries conf
             self.execute(True, "echo \"{0}\" > /etc/containers/registries.conf && systemctl stop podman.service".format(REGISTRIES_CONF))
-            # Push busybox image to the local registry
+            # Push busybox image to the local registries
             self.execute(True, "podman tag busybox localhost:5000/my-busybox && podman push localhost:5000/my-busybox")
+            self.execute(True, "podman tag busybox localhost:6000/my-busybox && podman push localhost:6000/my-busybox")
             # Untag busybox image which duplicates the image we are about to download
             self.execute(True, "podman rmi -f busybox")
 
@@ -433,6 +435,7 @@ class TestApplication(testlib.MachineCase):
             def fillDialog(self):
                 # Search for image specified with self.imageName and self.imageTag
                 b.click("#{0}".format(self.user))
+                b.set_val('#registry-select', "localhost:5000")
                 # HACK: Sometimes the value is not shown fully. FIXME
                 b.set_input_text("#search-image-dialog-name", self.imageName, value_check=False)
                 if self.imageTag:
@@ -468,7 +471,7 @@ class TestApplication(testlib.MachineCase):
                 checkImage(b, "localhost:5000/{0}:{1}".format(self.imageName, self.imageTag or "latest"), "system" if self.user == "system" else "admin")
 
                 # Find out this image ID
-                self.imageSha = execute(self.user == "system", "podman inspect --format '{{{{.Id}}}}' {0}:{1}".format(self.imageName, self.imageTag or "latest")).strip()
+                self.imageSha = execute(self.user == "system", "podman inspect --format '{{{{.Id}}}}' localhost:5000/{0}:{1}".format(self.imageName, self.imageTag or "latest")).strip()
 
                 return self
 
@@ -505,6 +508,19 @@ class TestApplication(testlib.MachineCase):
         self.login_and_go("/podman", authorized=True, superuser=True)
         b.wait_present("#app")
 
+        # Test registries
+        b.click("header button:contains(Get new image)")
+        b.wait_present('div.modal-dialog div.modal-header h4.modal-title:contains("Search Image")')
+        # HACK: Sometimes the value is not shown fully. FIXME
+        b.set_input_text("#search-image-dialog-name", "my-busybox", value_check=False)
+
+        b.wait_present("div.list-group .image-list-item label:contains('localhost:5000/my-busybox')")
+        b.wait_present("div.list-group .image-list-item label:contains('localhost:6000/my-busybox')")
+
+        b.set_val('#registry-select', "localhost:6000")
+        b.wait_not_present("div.list-group .image-list-item label:contains('localhost:5000/my-busybox')")
+        b.wait_present("div.list-group .image-list-item label:contains('localhost:6000/my-busybox')")
+
         dialog0 = DownloadImageDialog('my-busybox', user="system")
         dialog0.openDialog() \
               .fillDialog() \
@@ -518,7 +534,7 @@ class TestApplication(testlib.MachineCase):
               .expectDownloadSuccess()
         dialog1.deleteImage(True)
 
-        dialog0.deleteImage()
+        dialog0.deleteImage(True)
 
         dialog = DownloadImageDialog('my-busybox', 'latest', user="system")
         dialog.openDialog() \