From a649d176a3812e2e6f72d2d5d4ea45abe0756437 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 2 Feb 2017 00:30:56 +0300
Subject: [PATCH] Fixes

---
 src/Gtk/Avalonia.Gtk3/PopupImpl.cs    | 5 +++--
 src/Gtk/Avalonia.Gtk3/TopLevelImpl.cs | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/PopupImpl.cs b/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
index 7bd16cfabd..7d0423fd7a 100644
--- a/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
@@ -32,9 +32,10 @@ namespace Avalonia.Gtk3
                 _desiredSize = value;
                 if (GtkWidget.IsClosed)
                     return;
-                if (base.ClientSize == value)
-                    return;
                 Native.GtkWindowResize(GtkWidget, (int) value.Width, (int) value.Height);
+                if (Native.GtkWidgetGetWindow(GtkWidget) == IntPtr.Zero)
+                    Native.GtkWidgetRealize(GtkWidget);
+                Native.GdkWindowResize(Native.GtkWidgetGetWindow(GtkWidget), (int) value.Width, (int) value.Height);
             }
         }
     }
diff --git a/src/Gtk/Avalonia.Gtk3/TopLevelImpl.cs b/src/Gtk/Avalonia.Gtk3/TopLevelImpl.cs
index a8dc884244..80eb94d442 100644
--- a/src/Gtk/Avalonia.Gtk3/TopLevelImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/TopLevelImpl.cs
@@ -267,6 +267,8 @@ namespace Avalonia.Gtk3
 
         public void SetCursor(IPlatformHandle cursor)
         {
+            if (GtkWidget.IsClosed)
+                return;
             Native.GdkWindowSetCursor(Native.GtkWidgetGetWindow(GtkWidget), cursor?.Handle ??  IntPtr.Zero);
         }