diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/PopupControllerContainer.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/PopupControllerContainer.java
new file mode 100644
index 00000000..ad3249eb
--- /dev/null
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/PopupControllerContainer.java
@@ -0,0 +1,49 @@
+/*
+ * Clover - 4chan browser https://github.com/Floens/Clover/
+ * Copyright (C) 2014  Floens
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.floens.chan.ui.layout;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import static org.floens.chan.utils.AndroidUtils.dp;
+
+public class PopupControllerContainer extends FrameLayout {
+    public PopupControllerContainer(Context context) {
+        super(context);
+    }
+
+    public PopupControllerContainer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PopupControllerContainer(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int maxHeight = dp(600);
+
+        if (MeasureSpec.getSize(heightMeasureSpec) > maxHeight) {
+            heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.getMode(heightMeasureSpec));
+        }
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
diff --git a/Clover/app/src/main/res/layout/layout_controller_popup.xml b/Clover/app/src/main/res/layout/layout_controller_popup.xml
index 21cc6d66..708d4e71 100644
--- a/Clover/app/src/main/res/layout/layout_controller_popup.xml
+++ b/Clover/app/src/main/res/layout/layout_controller_popup.xml
@@ -15,18 +15,17 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top_view"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#88000000">
 
-    <FrameLayout
+    <org.floens.chan.ui.layout.PopupControllerContainer
         android:id="@+id/container"
         android:layout_width="600dp"
-        android:layout_height="600dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@drawable/dialog_full_light"/>
+        android:background="@drawable/dialog_full_light" />
 
 </FrameLayout>