1 files changed, 10 insertions, 7 deletions

diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index ab0a009a..7d6052e2 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -629,9 +629,6 @@ static iBool moveCursor_LookupWidget_(iLookupWidget *d, int delta) {
 static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     const char *cmd = command_UserEvent(ev);
-//    if (ev->type == SDL_MOUSEMOTION && contains_Widget(w, init_I2(ev->motion.x, ev->motion.y))) {
-//        setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
-//    }
     if (isCommand_Widget(w, ev, "lookup.ready")) {
         /* Take the results and present them in the list. */
         presentResults_LookupWidget_(d);
@@ -640,17 +637,23 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
     if (isResize_UserEvent(ev) || (equal_Command(cmd, "layout.changed") &&
                                    equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
         /* Position the lookup popup under the URL bar. */ {
+            const iWindow *window = get_Window();
+            const iInt2 rootSize = rootSize_Window(window);
+            const iRect navBarBounds = bounds_Widget(findWidget_App("navbar"));
             setSize_Widget(w, init_I2(width_Widget(findWidget_App("url")),
-                                      get_Window()->root->rect.size.y / 2));
+                                      (rootSize.y - bottom_Rect(navBarBounds)) / 2));
+            setPos_Widget(w, bottomLeft_Rect(bounds_Widget(findWidget_App("url"))));
 #if defined (iPlatformAppleMobile)
             /* TODO: Ask the system how tall the keyboard is. */ {
-                const iInt2 rootSize = rootSize_Window(get_Window());
-                if (rootSize.x > rootSize.y) {
+                if (isLandscape_App()) {
                     w->rect.size.y = rootSize.y * 4 / 10;
                 }
+                else if (deviceType_App() == phone_AppDeviceType) {
+                    w->rect.size.x = rootSize.x;
+                    w->rect.pos.x  = 0;
+                }
             }
 #endif
-            setPos_Widget(w, bottomLeft_Rect(bounds_Widget(findWidget_App("url"))));
             arrange_Widget(w);
         }
         updateVisible_ListWidget(d->list);