diff --git a/res/layout/clipboard_history_entry.xml b/res/layout/clipboard_history_entry.xml
index 901c402..45bc22a 100644
--- a/res/layout/clipboard_history_entry.xml
+++ b/res/layout/clipboard_history_entry.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
   <TextView android:id="@+id/clipboard_entry_text" style="@style/clipboardEntry"/>
-  <View android:id="@+id/clipboard_entry_addpin" style="@style/clipboardEntryButton" android:background="@android:drawable/ic_menu_add"/>
+  <LinearLayout style="@style/clipboardEntryButtons">
+    <View android:id="@+id/clipboard_entry_addpin" style="@style/clipboardEntryButton" android:background="@android:drawable/ic_menu_add"/>
+  </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/clipboard_pane.xml b/res/layout/clipboard_pane.xml
index 9929afa..bcb96a3 100644
--- a/res/layout/clipboard_pane.xml
+++ b/res/layout/clipboard_pane.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:background="?attr/colorKeyboard" android:hardwareAccelerated="false">
-  <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="@dimen/clipboard_view_height">
-    <LinearLayout android:orientation="vertical" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent">
+  <ScrollView android:layout_width="fill_parent" android:layout_height="@dimen/clipboard_view_height">
+    <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
       <TextView android:text="@string/clipboard_history_heading" style="@style/clipboardHeading" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-      <juloo.keyboard2.ClipboardHistoryView android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent" android:divider="?attr/clipboard_divider_color" android:dividerHeight="?attr/clipboard_divider_height"/>
-    </LinearLayout>
-    <LinearLayout android:orientation="vertical" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent">
+      <juloo.keyboard2.ClipboardHistoryView android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="?attr/clipboard_divider_color" android:dividerHeight="?attr/clipboard_divider_height"/>
       <TextView android:text="@string/clipboard_pin_heading" style="@style/clipboardHeading" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-      <juloo.keyboard2.ClipboardPinView android:id="@+id/clipboard_pin_view" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent" android:divider="?attr/clipboard_divider_color" android:dividerHeight="?attr/clipboard_divider_height"/>
+      <juloo.keyboard2.ClipboardPinView android:id="@+id/clipboard_pin_view" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="?attr/clipboard_divider_color" android:dividerHeight="?attr/clipboard_divider_height"/>
     </LinearLayout>
-  </LinearLayout>
+  </ScrollView>
   <juloo.keyboard2.Keyboard2View layout="@xml/clipboard_bottom_row" android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?attr/colorKeyboard"/>
 </LinearLayout>
diff --git a/res/layout/clipboard_pin_entry.xml b/res/layout/clipboard_pin_entry.xml
index 7678cd0..d46e18b 100644
--- a/res/layout/clipboard_pin_entry.xml
+++ b/res/layout/clipboard_pin_entry.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
   <TextView android:id="@+id/clipboard_pin_text" style="@style/clipboardEntry" android:maxLines="3"/>
-  <View android:id="@+id/clipboard_pin_remove" style="@style/clipboardEntryButton" android:background="@android:drawable/ic_menu_delete"/>
+  <LinearLayout style="@style/clipboardEntryButtons">
+    <View android:id="@+id/clipboard_pin_remove" style="@style/clipboardEntryButton" android:background="@android:drawable/ic_menu_delete"/>
+  </LinearLayout>
 </LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e47ec47..c230cd1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,12 +34,17 @@
     <item name="android:fontWeight">700</item>
     <item name="android:textColor">?attr/colorSubLabel</item>
   </style>
+  <style name="clipboardEntryButtons">
+    <item name="android:orientation">horizontal</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:layout_marginRight">12dp</item>
+  </style>
   <style name="clipboardEntryButton">
-    <item name="android:layout_gravity">top</item>
     <item name="android:layout_width">24dp</item>
     <item name="android:layout_height">24dp</item>
-    <item name="android:layout_marginVertical">14dp</item>
-    <item name="android:layout_marginRight">6dp</item>
+    <item name="android:layout_marginHorizontal">2dp</item>
   </style>
   <!-- Launcher activity -->
   <style name="paragraph">
diff --git a/srcs/juloo.keyboard2/ClipboardHistoryView.java b/srcs/juloo.keyboard2/ClipboardHistoryView.java
index b5ed0c6..88684a9 100644
--- a/srcs/juloo.keyboard2/ClipboardHistoryView.java
+++ b/srcs/juloo.keyboard2/ClipboardHistoryView.java
@@ -5,13 +5,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ListView;
 import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public final class ClipboardHistoryView extends ListView
+public final class ClipboardHistoryView extends NonScrollListView
   implements ClipboardHistoryService.OnClipboardHistoryChange
 {
   List<String> _history;
diff --git a/srcs/juloo.keyboard2/ClipboardPinView.java b/srcs/juloo.keyboard2/ClipboardPinView.java
index c7a001b..fd4a4a3 100644
--- a/srcs/juloo.keyboard2/ClipboardPinView.java
+++ b/srcs/juloo.keyboard2/ClipboardPinView.java
@@ -6,7 +6,6 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ListView;
 import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,7 +13,7 @@ import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONException;
 
-public final class ClipboardPinView extends ListView
+public final class ClipboardPinView extends NonScrollListView
 {
   /** Preference file name that store pinned clipboards. */
   static final String PERSIST_FILE_NAME = "clipboards";
diff --git a/srcs/juloo.keyboard2/NonScrollListView.java b/srcs/juloo.keyboard2/NonScrollListView.java
new file mode 100644
index 0000000..32ef744
--- /dev/null
+++ b/srcs/juloo.keyboard2/NonScrollListView.java
@@ -0,0 +1,38 @@
+package juloo.keyboard2;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View.MeasureSpec;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/** A non-scrollable list view that can be embedded in a bigger ScrollView.
+    Credits to Dedaniya HirenKumar in
+    https://stackoverflow.com/questions/18813296/non-scrollable-listview-inside-scrollview */
+public class NonScrollListView extends ListView
+{
+  public NonScrollListView(Context context)
+  {
+    super(context);
+  }
+
+  public NonScrollListView(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+  }
+
+  public NonScrollListView(Context context, AttributeSet attrs, int defStyle)
+  {
+    super(context, attrs, defStyle);
+  }
+
+  @Override
+  public void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+  {
+    int heightMeasureSpec_custom = MeasureSpec.makeMeasureSpec(
+        Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
+    ViewGroup.LayoutParams params = getLayoutParams();
+    params.height = getMeasuredHeight();
+  }
+}