diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index ac2e27a7fd..88abfd03cf 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -141,6 +141,8 @@ public:
 #ifdef __WXGTK3__
     void GTKUpdateClientSizeIfNecessary();
 
+    virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE;
+
     virtual void WXSetInitialFittingClientSize(int flags) wxOVERRIDE;
 
 private:
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index d5cf3268e3..ec2b6e5b51 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1568,6 +1568,14 @@ void wxTopLevelWindowGTK::GTKUpdateClientSizeIfNecessary()
     }
 }
 
+void wxTopLevelWindowGTK::SetMinSize(const wxSize& minSize)
+{
+    wxTopLevelWindowBase::SetMinSize(minSize);
+
+    // Explicitly set minimum size should override the pending size, if any.
+    m_pendingFittingClientSizeFlags &= ~wxSIZE_SET_MIN;
+}
+
 void wxTopLevelWindowGTK::WXSetInitialFittingClientSize(int flags)
 {
     // In any case, update the size immediately.