3 files changed, 10 insertions, 3 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 77a9668f2f..f4a5e5b198 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -364,8 +364,13 @@ MainWindow::MainWindow(QWidget *parent) :
         Qt::BlockingQueuedConnection);
 #endif
 
+    // We set the minimum width of df_combo_box_ in resizeEvent so that it won't shrink
+    // down too much if we have a lot of filter buttons. Unfortunately that can break
+    // Aero snapping if our window is large or maximized. Set a minimum width here in
+    // order to counteract that.
+    setMinimumWidth(350); // Arbitrary
     df_combo_box_ = new DisplayFilterCombo();
-    const DisplayFilterEdit *df_edit = dynamic_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
+    const DisplayFilterEdit *df_edit = qobject_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
     connect(df_edit, SIGNAL(pushFilterSyntaxStatus(const QString&)),
             main_ui_->statusBar, SLOT(pushFilterStatus(const QString&)));
     connect(df_edit, SIGNAL(popFilterSyntaxStatus()), main_ui_->statusBar, SLOT(popFilterStatus()));
diff --git a/ui/qt/widgets/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp
index 08c097e12c..5cd469f0a0 100644
--- a/ui/qt/widgets/capture_filter_combo.cpp
+++ b/ui/qt/widgets/capture_filter_combo.cpp
@@ -30,7 +30,8 @@ CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) :
     // completion for fields handled by CaptureFilterEdit.
     setAutoCompletion(false);
     setLineEdit(cf_edit_);
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    // Default is Preferred.
+    setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy());
     setInsertPolicy(QComboBox::NoInsert);
     setAccessibleName(tr("Capture filter selector"));
     setStyleSheet(
diff --git a/ui/qt/widgets/display_filter_combo.cpp b/ui/qt/widgets/display_filter_combo.cpp
index 947dee7f03..dca82bffc8 100644
--- a/ui/qt/widgets/display_filter_combo.cpp
+++ b/ui/qt/widgets/display_filter_combo.cpp
@@ -34,7 +34,8 @@ DisplayFilterCombo::DisplayFilterCombo(QWidget *parent) :
     // completion for fields handled by DisplayFilterEdit.
     setAutoCompletion(false);
     setLineEdit(new DisplayFilterEdit(this, DisplayFilterToApply));
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    // Default is Preferred.
+    setSizePolicy(QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy());
     setAccessibleName(tr("Display filter selector"));
     cur_display_filter_combo = this;
     setStyleSheet(