diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java
index 2a88112..1c3a0cb 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java
@@ -381,11 +381,21 @@ abstract public class AbstractInfoFragment extends AbstractFragment
                 int lines = titleTextView.getLineCount();
                 int maxLines = TextViewCompat.getMaxLines(titleTextView);
                 if (lines > maxLines) {
-                    titleTextView.setHorizontallyScrolling(true);
+                    titleTextView.setEllipsize(TextUtils.TruncateAt.END);
                     titleTextView.setClickable(true);
                     titleTextView.setOnClickListener(new View.OnClickListener() {
                         @Override
-                        public void onClick(View v) { v.setSelected(!v.isSelected()); }
+                        public void onClick(View v) {
+                            v.setSelected(!v.isSelected());
+                            TextUtils.TruncateAt ellipsize;
+                            if (v.isSelected()) {
+                                ellipsize = TextUtils.TruncateAt.MARQUEE;
+                            } else {
+                                ellipsize = TextUtils.TruncateAt.END;
+                            }
+                            titleTextView.setEllipsize(ellipsize);
+                            titleTextView.setHorizontallyScrolling(v.isSelected());
+                        }
                     });
                 }
             }
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
index 9e4ebcc..b80462c 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java
@@ -759,11 +759,21 @@ public class NowPlayingFragment extends Fragment
                 int lines = mediaTitle.getLineCount();
                 int maxLines = TextViewCompat.getMaxLines(mediaTitle);
                 if (lines > maxLines) {
-                    mediaTitle.setHorizontallyScrolling(true);
+                    mediaTitle.setEllipsize(TextUtils.TruncateAt.END);
                     mediaTitle.setClickable(true);
                     mediaTitle.setOnClickListener(new View.OnClickListener() {
                         @Override
-                        public void onClick(View v) { v.setSelected(!v.isSelected()); }
+                        public void onClick(View v) {
+                            v.setSelected(!v.isSelected());
+                            TextUtils.TruncateAt ellipsize;
+                            if (v.isSelected()) {
+                                ellipsize = TextUtils.TruncateAt.MARQUEE;
+                            } else {
+                                ellipsize = TextUtils.TruncateAt.END;
+                            }
+                            mediaTitle.setEllipsize(ellipsize);
+                            mediaTitle.setHorizontallyScrolling(v.isSelected());
+                        }
                     });
                 }
             }